Index: branches/5.1.x/core/units/selectors/selectors_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/selectors/selectors_config.php	(.../selectors_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: selectors_config.php 11902 2009-07-15 01:07:23Z dmitrya $
+* @version	$Id: selectors_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-	$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'selectors',
 					'ItemClass'			=>	Array('class'=>'SelectorsItem','file'=>'selectors_item.php','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
@@ -142,6 +144,4 @@
 								),
 							),
 						),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: http_query.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: http_query.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class kHTTPQuery extends Params {
 	/**
 	 * $_POST vars
@@ -82,6 +84,13 @@
 	var $Conn;
 
 	/**
+	 * SessionID is given via "sid" variable in query string
+	 *
+	 * @var bool
+	 */
+	var $_sidInQueryString = false;
+
+	/**
 	 * Loads info from $_POST, $_GET and
 	 * related arrays into common place
 	 *
@@ -152,7 +161,17 @@
 			switch ($current) {
 				case 'G':
 					$this->Get = $this->AddVars($_GET);
+					if (array_key_exists('sid', $_GET)) {
+						$this->_sidInQueryString = true;
+					}
+
 					$vars = $this->processQueryString( $this->Get(ENV_VAR_NAME) );
+
+					if (array_key_exists('sid', $vars)) {
+						// used by Session::GetPassedSIDValue
+						$this->Get['sid'] = $vars['sid'];
+					}
+
 					$this->AddParams($vars);
 					break;
 
@@ -221,15 +240,13 @@
 //		$this->convertPostEvents();
 		//		if ($this->Application->RewriteURLs()) {
 		if ($this->Application->RewriteURLs() || $this->Get('_mod_rw_url_')) {
-			if( $this->Application->isDebugMode() )
-			{
+			if (defined('DEBUG_MODE') && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->profileStart('url_parsing');
 				$this->processRewriteURL();
 				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>'.$this->Get('t').'</b>)';
 				$this->Application->Debugger->profileFinish('url_parsing', $description);
 			}
-			else
-			{
+			else {
 				$this->processRewriteURL();
 			}
 		}
@@ -375,26 +392,19 @@
 	function extractSIDAndTemplate(&$parts)
 	{
 		$vars = Array ();
-		if (defined('INPORTAL_ENV') && INPORTAL_ENV) { // SID-TEMPLATE
-			$sub_parts = array_shift($parts);
-			list($sid, $t) = explode('-', $sub_parts, 2);
+		$sub_parts = array_shift($parts);
 
+		list ($sid, $t) = explode('-', $sub_parts, 2);
+
+		if ($sid) {
 			// Save Session ID
-			if ($sid) {
-				$this->Set('sid', $sid);
-				$vars['sid'] = $sid;
-			}
+			$this->Set('sid', $sid);
+			$vars['sid'] = $sid;
 		}
-		else { // SID:TEMPLATE
-			// Save Session ID
-			$sid = array_shift($parts);
-			if ($sid) $vars['sid'] = $sid;
 
-			$t = array_shift($parts);
-		}
-
 		// Save Template Name
 		$vars['t'] = $this->getDefaultTemplate($t);
+
 		return $vars;
 	}
 
@@ -493,7 +503,7 @@
 	 */
 	function getTemplateName($t)
 	{
-		if (isset($this->Get['t']) && $this->Get['t']) {
+		if (array_key_exists('t', $this->Get) && $this->Get['t']) {
 			// template name is passed directly in url (GET method)
 			$t = $this->Get['t'];
 		}
@@ -503,13 +513,6 @@
 			$t = $this->Get('t');
 		}
 
-		if (is_numeric($t)) {
-			$sql = 'SELECT CONCAT(FilePath, \'/\', FileName)
-					FROM '.TABLE_PREFIX.'ThemeFiles
-					WHERE FileId = '.$t;
-			$t = $this->Conn->GetOne($sql);
-		}
-
 		return preg_replace('/\.tpl$/', '', $t);
 	}
 
@@ -571,27 +574,33 @@
 	 */
 	function getRedirectParams($access_error = false)
 	{
+		$vars = $this->Get;
 		$unset_vars = Array (ENV_VAR_NAME, 'rewrite', '_mod_rw_url_', 'Action');
 
-		$ret = $this->Get;
+		if (!$this->_sidInQueryString) {
+			$unset_vars[] = 'sid';
+		}
+
+		// remove system variables
 		foreach ($unset_vars as $var_name) {
-			if( isset($ret[$var_name]) ) {
-				unset( $ret[$var_name] );
+			if (array_key_exists($var_name, $vars)) {
+				unset($vars[$var_name]);
 			}
 		}
 
 		if ($access_error) {
-			$ret = $this->_removePassThroughVariables($ret);
+			$vars = $this->_removePassThroughVariables($vars);
 
 			if ($this->Application->IsAdmin()) {
 				// place 1 of 2 (also in UsersEventHandler::OnSessionExpire)
-				$ret['m_cat_id'] = 0; // category means nothing on admin login screen
-				$ret['m_wid'] = ''; // remove wid, otherwise parent window may add wid to its name breaking all the frameset (for <a> targets)
-				$ret['pass'] = 'm'; // don't pass any other (except "m") prefixes to admin login template
+				$vars['m_cat_id'] = 0; // category means nothing on admin login screen
+				$vars['m_wid'] = ''; // remove wid, otherwise parent window may add wid to its name breaking all the frameset (for <a> targets)
+				$vars['pass'] = 'm'; // don't pass any other (except "m") prefixes to admin login template
 			}
 		}
 
-		return $ret;
+		// transform arrays
+		return $this->_transformArrays($vars);
 	}
 
 	/**
@@ -617,6 +626,23 @@
 		return $url_params;
 	}
 
+	function _transformArrays($array, $level_prefix = '')
+	{
+		$ret = Array ();
+		foreach ($array as $var_name => $var_value) {
+			$new_var_name = $level_prefix ? $level_prefix . '[' . $var_name . ']' : $var_name;
+
+			if (is_array($var_value)) {
+				$ret = array_merge($ret, $this->_transformArrays($var_value, $new_var_name));
+			}
+			else {
+				$ret[$new_var_name] = $var_value;
+			}
+		}
+
+		return $ret;
+	}
+
 	function writeRequestLog($filename)
 	{
 		$folder_path = dirname(FULL_PATH.'/'.$filename);
@@ -653,6 +679,4 @@
 		}
 	}
 
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_related_search.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_e-mail.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/install/incs/install.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/install/incs/install.tpl	(.../install.tpl)	(revision 12127)
+++ branches/5.1.x/core/install/incs/install.tpl	(.../install.tpl)	(revision 12657)
@@ -1,12 +1,14 @@
+
 <html>
 	<head>
 		<title>In-Portal Installation</title>
-		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
 		<base href="<?php echo $this->baseURL; ?>"/>
 
 		<link rel="stylesheet" type="text/css" href="incs/style.css" />
 		<script type="text/javascript" src="incs/script.js"></script>
+		<script type="text/javascript" src="../admin_templates/js/toolbar.js"></script>
 	</head>
 
 	<body topmargin="0" leftmargin="0" marginwidth="0" marginheight="0" style="height: 100%">
@@ -18,12 +20,11 @@
 				<td height="90">
 					<table cellpadding="0" cellspacing="0" border="0" width="100%" height="90">
 						<tr>
-							<td rowspan="3" valign="top"><a href="http://www.in-portal.net" target="_top"><img title="In-portal" src="incs/img/globe.gif" width="84" height="91" border="0" alt="In-Portal"/></a></td>
-							<td rowspan="3" valign="top"><a href="http://www.in-portal.net" target="_top"><img title="In-portal" src="incs/img/logo.gif" width="150" height="91" border="0" alt="In-Portal"/></a></td>
+							<td rowspan="3" valign="top"><a href="http://www.in-portal.net" target="_top"><img title="In-Portal" src="incs/img/logo.jpg" width="267" height="91" border="0" alt="In-Portal"/></a></td>
 							<td rowspan="3" width="100%" align="right">&nbsp;</td>
 							<td width="400"><img title="" src="incs/img/blocks.gif" width="400" height="73" alt="blocks" /></td>
 						</tr>
-						<tr><td align="right" background="incs/img/version_bg.gif" class="head_version" valign="top"><img title="" src="incs/img/spacer.gif" width="1" height="14" alt=""/>In-Portal Version <?php echo $this->toolkit->GetMaxModuleVersion('Core'); ?>: English US</td></tr>
+						<tr><td align="right" background="incs/img/version_bg.gif" class="head_version" valign="top"><img title="" src="incs/img/spacer.gif" width="1" height="14" alt=""/>In-Portal: English US</td></tr>
 						<tr><td><img title="" src="incs/img/blocks2.gif" width="400" height="2" alt="blocks2"/><br /></td></tr>
 						<tr><td bgcolor="black" colspan="4"><img title="" src="incs/img/spacer.gif" width="1" height="1" alt=""/><br /></td></tr>
 					</table>
@@ -58,30 +59,57 @@
 											<span class="tablenav_link"><?php echo 'Step '.$this->GetStepNumber().' - '.$this->GetStepInfo('step_title'); ?></span>
 								 		</td>
 								 		<td align="right" class="tablenav" background="incs/img/tabnav_back.jpg" width="100%">
+								 		<!--
 								 			<a class="link" onclick="ShowHelp('in-portal:install');">
 								 				<img src="incs/img/blue_bar_help.gif" border="0">
 								 			</a>
+								 		-->
 								 		</td>
 								 	</tr>
 								 </table>
 								<!-- section header: end -->
 
-								<!-- toolbar: begin -->
-								<table border=0 cellpadding=0 cellspacing=0 width="100%" class="toolbar">
-									<tr>
-										<td>
-											<a href="javascript:continue_install();">
-												<img border="0" src="incs/img/toolbar/tool_select.gif" id="img_Save" width="32" height="32" border="0" alt="Save" onmouseout="swap_image('img_Save', 'toolbar/tool_select.gif');" onmouseover="swap_image('img_Save','toolbar/tool_select_f2.gif');" /><br />
-											</a>
-										</td>
-										<td>
-											<img src="incs/img/toolbar/tool_cancel.gif" id="img_Cancel" width="32" height="32" border="0" alt="Cancel" onmouseout="swap_image('img_Cancel', 'toolbar/tool_cancel.gif');" onmouseover="swap_image('img_Cancel','toolbar/tool_cancel_f2.gif');" onclick="history.go(-1);" /><br />
-										</td>
-										<td width="100%">&nbsp;</td>
-									</tr>
-								</table>
-								<!-- toolbar: end -->
+								<?php
+									if ($this->buttonVisible('any')) {
+								?>
+									<!-- toolbar: begin -->
+									<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+										<tbody>
+											<tr>
+											  	<td>
+											  		<script type="text/javascript">
+												  		var $use_toolbarlabels = true;
+												  		var $visible_toolbar_buttons = true;
+											  			var img_path = '<?php echo $this->baseURL; ?>../admin_templates/img/';
+														var is = {ie6up: document.all, gecko: !document.all};
 
+														var a_toolbar = new ToolBar();
+
+														<?php
+															if ($this->buttonVisible('refresh')) {
+																echo "a_toolbar.AddButton( new ToolBarButton('refresh', 'Refresh', continue_install) );";
+															}
+
+															if ($this->buttonVisible('back')) {
+																echo "a_toolbar.AddButton( new ToolBarButton('prev', 'Back', function() { history.go(-1); }) );";
+															}
+
+															if ($this->buttonVisible('continue')) {
+																echo "a_toolbar.AddButton( new ToolBarButton('next', 'Continue', continue_install) );";
+															}
+														?>
+
+														a_toolbar.Render();
+													</script>
+		  										</td>
+											</tr>
+										</tbody>
+									</table>
+									<!-- toolbar: end -->
+								<?php
+									}
+								?>
+
 								<table width="100%" border="0" cellspacing="0" cellpadding="0" class="tableborder">
 									<tr valign="top">
 										<td width="60%" bgcolor="#F0F0F0">
@@ -91,29 +119,38 @@
 												<?php echo $this->GetStepBody(); ?>
 												<!-- step body: end -->
 
-												<!-- step error message: begin -->
-												<tr class="table-color2">
-													<td colspan="2">
-														<p class="error">
-															<?php echo $this->errorMessage; ?>
-														</p>
-														<br/>
-													</td>
-												</tr>
-												<!-- step error message: end -->
+												<?php
+													if (is_string($this->errorMessage) && $this->errorMessage) {
+												?>
+													<!-- step error message: begin -->
+													<tr class="table-color2">
+														<td colspan="2">
+															<p class="error">
+																<?php echo $this->errorMessage; ?>
+															</p>
+															<br/>
+														</td>
+													</tr>
+													<!-- step error message: end -->
+												<?php
+													}
+												?>
 
 												<!-- next, prev buttons: begin -->
 												<tr>
 													<td colspan="2">
 														<br />
-														<input type="submit" name="submit_form" value="Continue" class="button" />
-
 														<?php
-															if ($this->GetStepNumber() > 1 && $this->GetNextStep() != -1) {
-										  						echo '<input type="reset" name="cancel" value="Cancel" class="button" onclick="history.go(-1);" />';
+															if ($this->buttonVisible('refresh')) {
+																echo '<input type="submit" name="refresh_form" value="Refresh" class="button" /> ';
 															}
-														?>
 
+															if ($this->buttonVisible('back')) {
+										  						echo '<input type="reset" name="back" value="Back" class="button" onclick="history.go(-1);" /> ';
+															}
+
+															echo '<input type="submit" name="submit_form" value="Continue" class="button" />';
+														?>
 										  				<input type="hidden" name="step" value="<?php echo $this->currentStep; ?>"/>
 										  				<input type="hidden" name="preset" value="<?php echo $this->stepsPreset; ?>"/>
 													</td>
@@ -143,7 +180,7 @@
 
 			<tr>
 				<td class="footer">
-					Powered by In-portal &copy; 1997-<?php echo date('Y'); ?>, Intechnic Corporation. All rights reserved.
+					Powered by <a href="http://www.in-portal.org" target="_blank">In-Portal</a>, Copyright &copy; 1997-<?php echo date('Y'); ?> Intechnic. All rights reserved.
 					<br /><img src="incs/img/spacer.gif" width="1" height="10" alt="" />
 				</td>
 			</tr>
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_affiliate_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/general/libchart/classes/view/chart/BarChart.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/chart/BarChart.php	(.../BarChart.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/chart/BarChart.php	(.../BarChart.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * Base abstract class for rendering both horizontal and vertical bar charts.
 	 *
@@ -170,5 +172,4 @@
 
 			return $pointList;
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_language_var.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/blue_bar_help.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: languages_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class LanguagesEventHandler extends kDBEventHandler
 	{
 		/**
@@ -243,7 +245,13 @@
 				// without this language change in admin will cause erase of last remembered tree section
 				$this->Application->SetVar('skip_last_template', 1);
 			}
+			elseif (MOD_REWRITE) {
+				$mod_rewrite_helper =& $this->Application->recallObject('ModRewriteHelper');
+				/* @var $mod_rewrite_helper kModRewriteHelper */
 
+				$mod_rewrite_helper->removePages();
+			}
+
 			//$this->Application->LinkVar('language', 'm_lang');
 		}
 
@@ -416,6 +424,7 @@
 			$q = 'CREATE TABLE ' . $tmp_name . '
 						SELECT
 							source.Phrase,
+							source.PhraseKey,
 							source.Translation,
 							source.PhraseType,
 							NULL As PhraseId,
@@ -432,6 +441,4 @@
 			$this->Conn->Query('DROP TABLE ' . $tmp_name);
 		}
 
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/reviews/reviews_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reviews_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: reviews_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class ReviewsEventHandler extends kDBEventHandler
 	{
 		/**
@@ -154,9 +156,8 @@
 		{
 			$main_prefix = $this->Application->GetTopmostPrefix($event->Prefix, true);
 			// this will return LINK for l, ARTICLE for n, TOPIC for bb, PRODUCT for p
-			$item_prefix = $this->Application->getUnitOption($main_prefix, 'PermItemPrefix');
 
-			return $item_prefix;
+			return $this->Application->getUnitOption($main_prefix, 'PermItemPrefix');
 		}
 
 		/**
@@ -326,21 +327,67 @@
 				$spam_helper->InitHelper($parent_info['ParentId'], 'Review', $review_settings);
 
 				$spam_helper->AddToSpamControl();
+
+				$review_status = $object->GetDBField('Status');
+
+				if ($review_status == STATUS_ACTIVE || $review_status == STATUS_PENDING) {
+					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'ADD' : 'ADD.PENDING');
+					$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
+					$this->Application->EmailEventAdmin($email_event);
+				}
 			}
 		}
 
-
 		/**
 		 * Updates item review counter
 		 *
 		 * @param kEvent $event
 		 */
 		function OnAfterItemUpdate(&$event)
 		{
+			parent::OnAfterItemUpdate($event);
+
 			$this->updateSubitemCounters($event);
+
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			if ($this->Application->IsAdmin() && !$object->IsTempTable()) {
+				// send email on review status change from reviews grid in admin
+				$review_status = $object->GetDBField('Status');
+				$process_status = Array (STATUS_ACTIVE, STATUS_DISABLED);
+
+				if (($review_status != $object->GetOriginalField('Status')) && in_array($review_status, $process_status)) {
+					$this->_loadMainObject($event);
+
+					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'APPROVE' : 'DENY');
+					$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
+				}
+			}
 		}
 
 		/**
+		 * Loads main object of review (link, article, etc.)
+		 *
+		 * @param kEvent $event
+		 * @return kCatDBItem
+		 */
+		function _loadMainObject(&$event)
+		{
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
+			$parent_table_key = $this->Application->getUnitOption($event->Prefix, 'ParentTableKey');
+			$foreign_key = $this->Application->getUnitOption($event->Prefix, 'ForeignKey');
+
+			$main_object =& $this->Application->recallObject($parent_prefix, null, Array ('skip_autoload' => true));
+			/* @var $main_object kDBItem */
+
+			$main_object->Load($object->GetDBField($foreign_key), $parent_table_key);
+		}
+
+		/**
 		 * Updates total review counter, cached rating, votes count
 		 *
 		 * @param kEvent $event
@@ -496,6 +543,4 @@
 			}
 			return $title_field;
 		}
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/fck/fck_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/fck/fck_config.php	(.../fck_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/fck/fck_config.php	(.../fck_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: fck_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: fck_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'fck',
 
@@ -45,6 +47,4 @@
 //		    'CustomDataId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 //		    'ResourceId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 		),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_language_var_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_selector_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/install/step_templates/check_paths.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/install/step_templates/check_paths.tpl	(.../check_paths.tpl)	(revision 12127)
+++ branches/5.1.x/core/install/step_templates/check_paths.tpl	(.../check_paths.tpl)	(revision 12657)
@@ -3,17 +3,24 @@
 ?>
 <tr class="table-color2">
 	<td class="text"><b>%s</b></td>
-  	<td align="left">%s</td>
+  	<td width="30" align="center">%s</td>
 </tr>
 <?php
 	$folder_tpl = ob_get_clean();
 
 	$writeable_base = $this->toolkit->getSystemConfig('Misc', 'WriteablePath');
 	foreach ($this->writeableFolders as $folder_path) {
-		$file_path = FULL_PATH . str_replace('$1', $writeable_base, $folder_path);
-		if (file_exists($file_path)) {
-			$folder_status = !is_writable($file_path) ? '<span class="error">FAILED</span>' : 'OK';
-			echo sprintf($folder_tpl, $file_path, $folder_status);
+		$file_path =  str_replace('$1', $writeable_base, $folder_path);
+		if (file_exists(FULL_PATH . $file_path)) {
+			if (!is_writable(FULL_PATH . $file_path)) {
+				$folder_status = '[<span class="error">FAILED</span>]';
+				$error_message = ' (<span class="error">777 required</span>)';
+			}
+			else {
+				$folder_status = '[<span style="color:green;">OK</span>]';
+				$error_message = '';
+			}
+			echo sprintf($folder_tpl, $file_path . $error_message, $folder_status);
 		}
 	}
 ?>
\ No newline at end of file
Index: branches/5.1.x/core/units/general/libchart/classes/view/primitive/Padding.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/primitive/Padding.php	(.../Padding.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/primitive/Padding.php	(.../Padding.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * A padding.
 	 *
@@ -64,5 +66,4 @@
 				$this->left = $left;
 			}
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_tool_import.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_custom.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/favorites/favorites_eh.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/favorites/favorites_eh.php	(.../favorites_eh.php)	(revision 12127)
+++ branches/5.1.x/core/units/favorites/favorites_eh.php	(.../favorites_eh.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: favorites_eh.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: favorites_eh.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class FavoritesEventHandler extends kDBEventHandler {
 
 	/**
@@ -97,7 +99,4 @@
 		$this->Conn->Query($sql);
 	}
 
-}
-
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
Index: branches/5.1.x/core/kernel/utility/event.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/event.php	(.../event.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/event.php	(.../event.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: event.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: event.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class kEvent extends kBase {
 
 		/**
@@ -168,7 +170,8 @@
 		{
 			$args = func_get_args();
 			if (count($args) > 1) {
-				array_unshift($args, $this->specificParams);
+				array_unshift_ref($args, $this->specificParams);
+
 				return call_user_func_array('getArrayValue', $args); // getArrayValue($this->specificParams, $name);
 			}
 			return isset($this->specificParams[$name]) ? $this->specificParams[$name] : false;
@@ -329,6 +332,4 @@
 			return $section;
 		}
 
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/sections/site_config_tp.php
===================================================================
diff -u -N -r12495 -r12657
--- branches/5.1.x/core/units/sections/site_config_tp.php	(.../5.0.x/core/units/sections/site_config_tp.php)	(revision 12495)
+++ branches/5.1.x/core/units/sections/site_config_tp.php	(.../5.1.x/core/units/sections/site_config_tp.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_config_tp.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: site_config_tp.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_custom.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_file.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_style_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/nparser/nparser_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/nparser/nparser_config.php	(.../nparser_config.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/nparser/nparser_config.php	(.../nparser_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: nparser_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: nparser_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-	$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'nparser',
 
 					'EventHandlerClass'	=>	Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
Index: branches/5.1.x/core/admin_templates/groups/groups_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/groups/groups_list.tpl	(.../groups_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/groups/groups_list.tpl	(.../groups_list.tpl)	(revision 12657)
@@ -15,7 +15,7 @@
 	  			}
 
 	  			var a_toolbar = new ToolBar();
-					a_toolbar.AddButton( new ToolBarButton('new_group', '<inp2:m_phrase label="la_ToolTip_NewGroup" escape="1"/>',
+					a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewGroup" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 							function() {
 								set_hidden_field('remove_specials[g.total]', 1);
 								std_precreate_item('g.total', 'groups/groups_edit')
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_recalculate_order.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_agent.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/agents/agents_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/agents/agents_config.php	(.../agents_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: agents_config.php 11906 2009-07-18 00:11:13Z dmitrya $
+* @version	$Id: agents_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'agent',
 		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -58,11 +60,11 @@
 
 			'agent_list' => Array (
 				'prefixes' => Array ('agent_List'), 'format' => "!la_title_Agents!",
-				'toolbar_button' => Array ('new_agent', 'edit', 'delete', 'approve', 'decline', 'cancel', 'view', 'dbl-click'),
+				'toolbar_buttons' => Array ('new_agent', 'edit', 'delete', 'approve', 'decline', 'cancel', 'view', 'dbl-click'),
 				),
 
 			'agent_edit' => Array ('prefixes' => Array ('agent'), 'format' => "#agent_status# '#agent_titlefield#'",
-				'toolbar_button' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
 				),
 		),
 
@@ -71,7 +73,7 @@
 		'Sections' => Array (
 			'in-portal:agents' => Array (
 				'parent'		=>	'in-portal:website_setting_folder',
-				'icon'			=>	'agents',
+				'icon'			=>	'conf_agents',
 				'label'			=>	'la_title_Agents',
 				'url'			=>	Array('t' => 'agents/agent_list', 'pass' => 'm'),
 				'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
@@ -134,18 +136,21 @@
 
 		'Grids' => Array (
 			'Default' => Array (
-				'Icons' => Array ('default' => 'icon16_agent.gif'),
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					0 => 'icon16_disabled.png',
+				),
 				'Fields' => Array (
-					'AgentId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
-					'AgentName' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter',),
-					'AgentType' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter',),
-					'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter',),
-					'Event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter',),
-					'RunInterval' => Array ('title' => 'la_col_RunInterval', 'filter_block' => 'grid_range_filter',),
-					'RunMode' => Array ('title' => 'la_col_RunMode', 'filter_block' => 'grid_options_filter',),
-					'LastRunOn' => Array ('title' => 'la_col_LastRunOn', 'filter_block' => 'grid_date_range_filter',),
-					'LastRunStatus' => Array ('title' => 'la_col_LastRunStatus', 'filter_block' => 'grid_options_filter',),
-					'NextRunOn' => Array ('title' => 'la_col_NextRunOn', 'filter_block' => 'grid_date_range_filter',),
+					'AgentId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+					'AgentName' => Array ('title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+					'AgentType' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
+					'Event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 280, ),
+//					'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 65, ),
+					'RunInterval' => Array ('title' => 'la_col_RunInterval', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
+					'RunMode' => Array ('title' => 'la_col_RunMode', 'filter_block' => 'grid_options_filter', 'width' => 85, ),
+					'LastRunOn' => Array ('title' => 'la_col_LastRunOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+					'LastRunStatus' => Array ('title' => 'la_col_LastRunStatus', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
+					'NextRunOn' => Array ('title' => 'la_col_NextRunOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
 				),
 			),
 		),
Index: branches/5.1.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r12453 -r12657
--- branches/5.1.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 12453)
+++ branches/5.1.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_events_handler.php 12453 2009-09-05 14:11:39Z alex $
+* @version	$Id: admin_events_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class AdminEventsHandler extends kDBEventHandler {
 
 	function mapPermissions()
@@ -38,14 +40,17 @@
 	 */
 	function CheckPermission(&$event)
 	{
+		$perm_value = null;
+
 		$system_events = Array (
 			'OnResetModRwCache', 'OnResetCMSMenuCache', 'OnResetSections',
-			'OnResetConfigsCache', 'OnCompileTemplates', 'OnGenerateTableStructure',
-			'OnRebuildThemes', 'OnCheckPrefixConfig',
+			'OnResetConfigsCache', 'OnDeleteCompiledTemplates', 'OnCompileTemplates',
+			'OnGenerateTableStructure',	'OnRebuildThemes', 'OnCheckPrefixConfig',
 		);
 
-		if ($this->Application->isDebugMode(false) && in_array($event->Name, $system_events)) {
-			return true;
+		if (in_array($event->Name, $system_events)) {
+			// events from "Tools -> System Tools" section are controlled via that section "edit" permission
+			$perm_value = $this->Application->CheckPermission($event->getSection() . '.edit');
 		}
 
 		$tools_events = Array (
@@ -62,15 +67,18 @@
 		);
 
 		if (array_key_exists($event->Name, $tools_events)) {
-			return $this->Application->CheckPermission($tools_events[$event->Name]);
+			$perm_value = $this->Application->CheckPermission($tools_events[$event->Name]);
 		}
 
 		if ($event->Name == 'OnSaveMenuFrameWidth') {
-			if (!$this->Application->IsAdmin() || !$this->Application->LoggedIn()) {
-				return false;
-			}
+			$perm_value = $this->Application->IsAdmin() && $this->Application->LoggedIn();
+		}
 
-			return true;
+		if (isset($perm_value)) {
+			$perm_helper =& $this->Application->recallObject('PermissionsHelper');
+			/* @var $perm_helper kPermissionsHelper */
+
+			return $perm_helper->finalizePermissionCheck($event, $perm_value);
 		}
 
 		return parent::CheckPermission($event);
@@ -105,34 +113,88 @@
 			$event->status = erSTOP;
 		}
 
-		$this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = "sections_parsed"');
+		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Cache
+				WHERE VarName = "sections_parsed"';
+		$this->Conn->Query($sql);
+
 		if (isset($this->Application->Memcached)) {
 			$this->Application->Memcached->delete('master:sections_parsed');
 		}
+
+		$event->SetRedirectParam('refresh_tree', 1);
 	}
 
 	function OnResetConfigsCache(&$event)
 	{
 		if ($this->Application->GetVar('ajax') == 'yes') {
 			$event->status = erSTOP;
 		}
-		$this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files" OR VarName = "configs_parsed" OR VarName = "sections_parsed"');
+
+		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Cache
+				WHERE VarName IN("config_files", "configs_parsed", "sections_parsed")';
+		$this->Conn->Query($sql);
+
 		if (isset($this->Application->Memcached)) {
 			$this->Application->Memcached->delete('master:config_files');
 			$this->Application->Memcached->delete('master:configs_parsed');
 			$this->Application->Memcached->delete('master:sections_parsed');
 		}
+
+		$event->SetRedirectParam('refresh_tree', 1);
 	}
 
 	function OnCompileTemplates(&$event)
 	{
 		$compiler =& $this->Application->recallObject('NParserCompiler');
 		/* @var $compiler NParserCompiler */
+
 		$compiler->CompileTemplatesStep();
 		$event->status = erSTOP;
 	}
 
 	/**
+	 * Deletes all compiled templates
+	 *
+	 * @param kEvent $event
+	 */
+	function OnDeleteCompiledTemplates(&$event)
+	{
+		if ($this->Application->GetVar('ajax') == 'yes') {
+			$event->status = erSTOP;
+		}
+
+		$base_path = WRITEABLE . DIRECTORY_SEPARATOR . 'cache';
+
+		// delete debugger reports
+		$debugger_reports = glob($base_path . '/debug_@*@.txt');
+
+		foreach ($debugger_reports as $debugger_report) {
+			unlink($debugger_report);
+		}
+
+		$this->_deleteCompiledTemplates($base_path);
+	}
+
+	function _deleteCompiledTemplates($folder, $unlink_folder = false)
+	{
+		$sub_folders = glob($folder . '/*', GLOB_ONLYDIR);
+
+		foreach ($sub_folders as $sub_folder) {
+			$this->_deleteCompiledTemplates($sub_folder, true);
+		}
+
+		$files = glob($folder . '/*.php');
+
+		foreach ($files as $file) {
+			unlink($file);
+		}
+
+		if ($unlink_folder) {
+			rmdir($folder);
+		}
+	}
+
+	/**
 	 * Generates sturcture for specified table
 	 *
 	 * @param kEvent $event
@@ -171,7 +233,7 @@
 		// 1. prepare config keys
 		$grids = Array (
 			'Default' => Array (
-				'Icons' => Array ('default' => 'icon16_custom.gif'),
+				'Icons' => Array ('default' => 'icon16_item.png'),
 				'Fields' => Array (),
 			)
 		);
@@ -552,7 +614,7 @@
 
 		$value = $this->Application->GetVar('Filedata');
 		if (!$value) return ;
-		$tmp_path = WRITEABLE.'/tmp/';
+		$tmp_path = WRITEABLE . '/tmp/';
 		$fname = $value['name'];
 		$id = $this->Application->GetVar('id');
 		if ($id) $fname = $id.'_'.$fname;
Index: branches/5.1.x/core/units/general/inp1_parser.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/general/inp1_parser.php	(revision 12127)
+++ branches/5.1.x/core/units/general/inp1_parser.php	(revision 0)
@@ -1,175 +0,0 @@
-<?php
-/**
-* @version	$Id: inp1_parser.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-class Inp1Parser extends kHelper {
-
-	var $InportalInited = false;
-
-	var $InpParsetInited = false;
-
-	function Parse($tname, $template_body)
-	{
-		global $objTemplate, $var_list, $var_list_update;
-
-		if ($tname == 'email_template') {
-			if ( !$this->InportalInited) {
-				$this->InitInPortal();
-			}
-			// in case Parsing was called through InitInPortal -> moudles -> frontaction -> emailevent
-			// we need to make sure old parser is initialized
-			$this->InitParser();
-			$template_body = $objTemplate->ParseTemplateFromBuffer($tname, $template_body);
-			return $template_body;
-		}
-
-		if (!$this->InportalInited) {
-			//$save_t = $this->Application->GetVar('t');
-			$this->InitInPortal();
-			$var_list['t'] = $this->cutTPL($var_list['t']);
-			if($var_list['t'] != $this->Application->GetVar('t'))
-			{
-				$get = $_GET;
-				unset($get['env'], $get['Action'], $get['_mod_rw_url_'], $get['rewrite']);
-				$this->Application->StoreVar('K4_Template_Referer', $this->Application->GetVar('t') );
-
-				$this->Application->Redirect($var_list['t'], $get);
-			}
-		}
-
-		$var_list['t'] = $this->cutTPL($var_list['t']);
-
-		if ($var_list['t'] != $this->Application->GetVar('t')) {
-			//$var_list['t'] = rtrim($var_list['t'],'.tpl');
-			$t = $var_list['t'];
-			$this->Application->SetVar('t', $t);
-			$template_cache =& $this->Application->recallObject('TemplatesCache');
-			$template_body = $this->Application->Parser->Parse( $template_cache->GetTemplateBody($t), $t, 0 );
-		}
-		else {
-			$this->InitParser();
-			$template_body = $objTemplate->ParseTemplateFromBuffer($tname, $template_body);
-		}
-		return $template_body;
-	}
-
-	function cutTPL($tname)
-	{
-		if( substr($tname,-4) == '.tpl' )
-		{
-			return substr($tname, 0, strlen($tname)-4 );
-		}
-		return $tname;
-	}
-
-	function InitParser()
-	{
-		global $objTemplate, $CurrentTheme, $objThemes, $var_list;
-		if ($this->InpParsetInited) return true;
-
-		$theme_id = $this->Application->IsAdmin() ? 1 : $this->Application->GetVar('m_theme');
-		if ($theme_id) {
-			$CurrentTheme = $objThemes->GetItem($theme_id);
-
-			$timeout = $CurrentTheme->Get('CacheTimeout');
-
-			$objTemplate = new clsTemplateList(FULL_PATH.THEMES_PATH.'/');
-	    }
-
-		$this->InpParsetInited = true;
-	}
-
-	function InitInPortal()
-	{
-		$this->InportalInited = true;
-		/*global 	$pathtoroot, $FrontEnd, $indexURL, $rootURL, $secureURL, $var_list, $CurrentTheme,
-						$objThemes, $objConfig, $m_var_list, $timeout, $objLanguages,
-						$TemplateRoot, $objTemplate, $html, $objSession, $Errors, $objCatList, $objUsers,
-						$env, $mod_prefix, $ExtraVars, $timestart, $timeend, $timeout, $sqlcount, $totalsql,
-						$template_path, $modules_loaded, $mod_root_cats, $objModules, $objItemTypes;*/
-
-
-		global $sec, $usec, $timestart, $pathtoroot, $FrontEnd, $indexURL, $kernel_version, $FormError,
-		$FormValues, $ItemTables, $KeywordIgnore, $debuglevel,
-		$LogLevel, $LogFile, $rq_value, $rq_name, $dbg_constMap, $dbg_constValue, $dbg_constName,
-		$debugger, $g_LogFile, $LogData, $Errors,
-		$g_DebugMode, $totalsql, $sqlcount, $objConfig, $ItemTypePrefixes, $ItemTagFiles, $objModules,
-		$objSystemCache, $objBanList, $objItemTypes, $objThemes, $objLanguages, $objImageList, $objFavorites,
-		$objUsers, $objGroups, $DownloadId, $objPermissions, $objPermCache, $m_var_list, $objCatList,
-		$objCustomFieldList, $objCustomDataList, $objCountCache, $CRLF, $objMessageList, $objEmailQueue,
-		$ExtraVars, $adodbConnection, $sql, $rs, $mod_prefix, $modules_loaded, $name,
-		$template_path, $mod_root_cats, $value, $mod, $ItemTypes,
-		$ParserFiles, $SessionQueryString, $var_list, $objSession,
-		$orderByClause, $TemplateRoot, $ip, $UseSession, $Action, $CookieTest, $sessionId,
-		$var_list_update, $CurrentTheme, $UserID, $objCurrentUser,
-		$folder_name, $objLinkList, $tag_override, $timeZones, $siteZone, $serverZone,
-		$lastExpire, $diffZone, $date, $nowDate, $lastExpireDate, $SearchPerformed,
-		$TotalMessagesSent, $ado, $adminDir, $rootURL, $secureURL, $html, $timeout,
-		$pathchar, $objTemplate, $objTopicList, $objArticleList, $objPostingList, $objCensorList,
-		$objSmileys, $objPMList, $SubscribeAddress, $SubscribeError, $SubscribeResult, $application,
-		$FCKeditorBasePath;
-
-		$pathtoroot = FULL_PATH.'/';
-
-		if (!file_exists(FULL_PATH.'/config.php')) {
-			echo "In-Portal is probably not installed, or configuration file is missing.<br>";
-			echo "Please use the installation script to fix the problem.<br><br>";
-			echo "<a href='admin/install.php'>Go to installation script</a><br><br>";
-			flush();
-			$this->Application->ApplicationDie();
-		}
-
-		//ob_start();
-		$FrontEnd = 1;
-
-		$indexURL="../../index.php"; //Set to relative URL from the theme directory
-
-		/* initalize the in-portal system */
-		include_once(FULL_PATH."/kernel/startup.php");
-
-		$rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
-		$secureURL = $rootURL;
-
-		if( !$var_list['t'] ) $var_list['t'] = 'index';
-
-		$this->InitParser();
-
-		// process referer in session: begin
-		if (is_object($objSession)) {
-			$k4_referer = $objSession->GetVariable('K4_Template_Referer');
-			if ($k4_referer) {
-				$_local_t = $k4_referer;
-				$this->Application->RemoveVar('K4_Template_Referer');
-			}
-			$objSession->SetVariable('Template_Referer', isset($_local_t) ? $_local_t : '');
-		}
-		// process referer in session: end
-
-		if ($this->Application->isDebugMode() && $Action) {
-			$this->Application->Debugger->setHTMLByIndex(1, 'Front Action: <b>'.$Action.'</b>', 'append');
-		}
-
-		LogEntry("Output Complete\n");
-
-		$timeend = getmicrotime();
-		$diff = $timeend - $timestart;
-
-		LogEntry("\nTotal Queries Executed: $sqlcount in $totalsql seconds\n");
-		LogEntry("\nPage Execution Time: $diff seconds\n", true);
-		if ($LogFile) {
-		  fclose($LogFile);
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_language_var.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/pdf/pdf_text.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/pdf/pdf_text.php	(.../pdf_text.php)	(revision 12127)
+++ branches/5.1.x/core/units/pdf/pdf_text.php	(.../pdf_text.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pdf_text.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: pdf_text.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,37 +12,40 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class kPDFTextElement extends kPDFElement {
+
 	protected $Data;
 	public $Ascent;
 	public $Descent;
 	public $Gap;
-	
+
 	public $ContentMinWidth;
 	public $ContentMaxWidht;
-	
+
 	function __construct($data='', $node, $helper)
 	{
 		parent::__construct($node, $helper);
 		$this->SetData($data, 0);
 	}
-	
+
 	function SetData($data)
 	{
 		$this->Data = $data;
 	}
-	
+
 	function Init()
 	{
 		parent::Init();
 		$this->SetCSSProperty('display', 'inline');
 	}
-	
+
 	function ComputeCSSProperties()
 	{
 		parent::ComputeCSSProperties();
 		// http://manual.prod.intechnic.lv/css21/text.html#q8
-		
+
 		$whitespace = str_replace('-', '', $this->GetCSSProperty('white-space')); // remove "-" to avoid confusion
 		if ($whitespace == 'normal' || $whitespace == 'nowrap' || $whitespace == 'preline') {
 			$this->Data = preg_replace('/[\n]{1}[\t\\r ]{1}|[\t\\r ]{1}[\n]{1}/', "\n", $this->Data);
@@ -57,7 +60,7 @@
 			$this->Data = preg_replace('/\t/', ' ', $this->Data);
 			$this->Data = preg_replace('/ [ ]+/', ' ', $this->Data);
 		}
-		
+
 		$transform = $this->GetCSSProperty('text-transform');
 		if ($transform == 'uppercase') {
 			$this->Data = strtoupper($this->Data);
@@ -69,46 +72,46 @@
 			$this->Data = ucwords($this->Data);
 		}
 	}
-	
+
 	function CheckDimensions()
 	{
 		$font_size = $this->GetCSSProperty('font-size');
 		$this->Helper->PDF->SetFont( $this->GetCSSProperty('font-family'), $font_size, $this->GetCSSProperty('font-weight'), $this->GetCSSProperty('font-style'), $this->GetCSSProperty('font-variant'));
 		$this->Ascent = $this->Helper->PDF->GetAscent();
 		$this->Descent = -$this->Helper->PDF->GetDescent(); // ((-$font->getDescent() / $units) * $size);
 		$this->Gap = $this->Helper->PDF->GetLineGap(); // (($font->getLineGap() / $units) * $size);
-		
+
 		// proportionally fit ascent & descent into font-size. Wiered why they are greater...
 		if ($this->Ascent + $this->Descent > $font_size) {
 			$this->Ascent = $this->Ascent/($this->Ascent+$this->Descent)*$font_size;
 			$this->Descent = $this->Descent/($this->Ascent+$this->Descent)*$font_size;
 		}
-		
+
 		if ($this->Helper->DimensionsMode == kPDFHelper::DM_SKIP) {
 			return ;
 		}
-		
+
 		if  ($this->Node->Name  == 'BR') {
 			$this->ContentHeight = $this->Ascent + $this->Descent + $this->Gap;
 			$this->SetCSSProperty('height', $this->ContentHeight);
 			$this->NextLine('');
 			$this->GetLineBox()->Closed();
-			return ; 
+			return ;
 		}
-		
+
 		$whitespace = str_replace('-', '', $this->GetCSSProperty('white-space')); // remove "-" to avoid confusion
-		
+
 		if (!$this->Data) {
 			parent::CheckDimensions();
 			return;
 		}
-		
+
 		$this->Wrap2($whitespace);
-		
+
 		$this->GetLineBox()->Closed();
 		parent::CheckDimensions();
 	}
-	
+
 	function CalcMinMaxContentWidth()
 	{
 		$font_size = $this->GetCSSProperty('font-size');
@@ -126,16 +129,16 @@
 		$this->MinContentWidth = $min_w;
 		parent::CalcMinMaxContentWidth();
 	}
-	
+
 	function Wrap2($whitespace) {
 		$start = $this->GetLineBox()->CurX;
-		
+
 		$data = $this->Data;
-		
+
 		if ($this->Parent->FirstChild === $this && ($whitespace == 'normal' || $whitespace == 'nowrap' || $whitespace == 'preline')) {
 			$data = ltrim($data);
 		}
-		
+
 		$words = preg_split('/([ \[\]\+\(\)]{1})/u', $data, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 		$words_count = count($words);
 		$i = 0;
@@ -146,17 +149,17 @@
 			$word_w = $this->Helper->PDF->GetStringWidth($words[$i]);
 			if ( (floor($max_width - $start - $elem_w - $word_w) < 0) && ($i > 0 || $start > 0) ) {
 				$line_break = true;
-				break;		
+				break;
 			}
 			$elem_w += $word_w;
 			$i++;
 		}
 		// remove space at the end of line
 		// @todo Find a way to detect a space at the end of last line, which is NOT wrapped
 		// otherwise right-aligned blocks will have a space at the end of last line
-		if ( ($i > 0 && $words[$i-1]) == ' ' && $line_break && 
+		if ( ($i > 0 && $words[$i-1]) == ' ' && $line_break &&
 				($whitespace == 'normal' || $whitespace == 'nowrap' || $whitespace == 'preline')
-				) { 
+				) {
 			$i--;
 			$elem_w -= $this->Helper->PDF->GetStringWidth($words[$i]);
 			array_splice($words, $i, 1);
@@ -186,13 +189,13 @@
 			} while ($elem && $elem->GetDisplayLevel() == 'inline');
 			$elem->Spacers += $spacers;
 			$this->GetLineBox()->CurX = $start + $elem_w;
-			
+
 			if ($i < $words_count) {
 				$this->NextLine(join( $words ));
 			}
 		}
 	}
-	
+
 	function GetFollowingSiblings()
 	{
 		$cur_line = $this->GetLineBox();
@@ -204,15 +207,15 @@
 		} while ( $elem && !($elem instanceof kPDFLine) );
 		return $cur_line->RemoveChildren($cur_pos+1);
 	}
-	
+
 	function CreateNextLine()
 	{
 		$cur_line = $this->GetLineBox();
 		$cur_line->Closed();
 		if ($this->Node->Name != 'BR') $cur_line->LastLine = false;
-		return $cur_line->Parent->AddChild( new kPDFLine($cur_line->Parent->Node, $this->Helper), true, $cur_line); 
+		return $cur_line->Parent->AddChild( new kPDFLine($cur_line->Parent->Node, $this->Helper), true, $cur_line);
 	}
-	
+
 	function NextLine($words)
 	{
 		$removed = $this->GetFollowingSiblings();
@@ -221,22 +224,22 @@
 			$new_elem = $next_line->AddChild( new kPDFTextElement( $words, $this->Node, $this->Helper ));
 			$new_elem->Closed();
 		}
-		
+
 		foreach ($removed as $elem) {
 			$next_line->AddChild( $elem, false ); //don't init
 		}
 	}
-	
+
 	function DrawAt($page, $x, $y, $spacer_w=0)
 	{
 		$page->SetLineWidth(0.1);
-		
+
 		$y += $this->Ascent; //finding baseline
 		$this->Helper->PDF->SetFont( $this->GetCSSProperty('font-family'), $this->GetCSSProperty('font-size'), $this->GetCSSProperty('font-weight'), $this->GetCSSProperty('font-style'), $this->GetCSSProperty('font-variant'));
 		if ($color = $this->GetCSSProperty('color')) {
 			$page->SetFillColor($color);
 		}
-		
+
 		if (defined('PDF_DEBUG_NO_TEXT')) return ;
 		if ($spacer_w == 0) {
 			$data = preg_replace('/\xA0/u', ' ', $this->Data);
@@ -254,5 +257,5 @@
 		}
 		$this->CurX = $x;
 	}
-	
+
 }
\ No newline at end of file
Index: branches/5.1.x/core/units/pdf/pdf_renderer_zend.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/pdf/pdf_renderer_zend.php	(.../pdf_renderer_zend.php)	(revision 12127)
+++ branches/5.1.x/core/units/pdf/pdf_renderer_zend.php	(.../pdf_renderer_zend.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pdf_renderer_zend.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: pdf_renderer_zend.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,37 +12,39 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+exit;
+
 require_once 'Zend/Pdf.php';
 class kZendPDFRenderer extends kPDFRenderer  {
 	public $PDF = null;
-	
+
 	/**
 	 * Enter description here...
 	 *
 	 * @var Zend_Pdf_Page
 	 */
 	public $CurPage = null;
-	
+
 	public $CurFont = null;
 	public $CurFontSize = null;
-	
+
 	function __construct()
 	{
 		$this->PDF = new Zend_Pdf();
 		$this->PDF->pages[] = ($page1 = new Zend_Pdf_Page(Zend_Pdf_Page::SIZE_A4));
 		$this->CurPage = $page1;
 	}
-	
+
 	function GetWidth()
 	{
 		return $this->CurPage->getWidth();
 	}
-	
+
 	function GetHeight()
 	{
 		return $this->CurPage->getHeight();
 	}
-	
+
 	function SetFont($font, $size)
 	{
 		$mapping = array(
@@ -59,62 +61,62 @@
 		$this->CurFontSize = $size;
 		return $this->CurPage->setFont($this->CurFont, $size);
 	}
-	
+
 	function SetFontSize($size)
 	{
 		$this->SetFont($this->CurFont, $size);
 	}
-	
+
 	function SetFillColor($color)
 	{
 		return $this->CurPage->setFillColor( new Zend_Pdf_Color_HTML($color) );
 	}
-	
+
 	function SetLineColor($color)
 	{
 		return $this->CurPage->setLineColor( new Zend_Pdf_Color_HTML($color) );
 	}
-	
-	function SetLineWidth($width) 
+
+	function SetLineWidth($width)
 	{
 		return $this->CurPage->setLineWidth($width);
 	}
-	
+
 	function DrawLine($x1, $y1, $x2, $y2)
 	{
 		return $this->CurPage->drawLine($x1, $y1, $x2, $y2);
 	}
-	
+
 	function DrawRectangle($x1, $y1, $x2, $y2, $mode)
 	{
 		return $this->CurPage->drawRectangle($x1, $y1, $x2, $y2, $mode);
 	}
-	
+
 	function DrawText($x, $y, $text)
 	{
 		return $this->CurPage->drawText($x, $y, $text);
 	}
-	
+
 	function GetPDFString()
 	{
 		return $this->PDF->render();
 	}
-	
+
 	function GetAscent()
 	{
 		return ($this->CurFont->getAscent() / $this->CurFont->getUnitsPerEm()) * $this->CurFontSize;
 	}
-	
+
 	function GetDescent()
 	{
 		return ($this->CurFont->getDescent() / $this->CurFont->getUnitsPerEm()) * $this->CurFontSize;
 	}
-	
+
 	function GetLineGap()
 	{
 		return ($this->CurFont->getLineGap() / $this->CurFont->getUnitsPerEm()) * $this->CurFontSize;
 	}
-	
+
 	function GetStringWidth($string)
 	{
 		$drawingString = iconv('UTF-8', 'UTF-16BE//IGNORE', $string);
Index: branches/5.1.x/core/units/pdf/pdf_helper.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/pdf/pdf_helper.php	(.../pdf_helper.php)	(revision 12127)
+++ branches/5.1.x/core/units/pdf/pdf_helper.php	(.../pdf_helper.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pdf_helper.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: pdf_helper.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 //define('PDF_DEBUG_NO_TEXT', 1); // do not draw text
 //define('PDF_DEBUG_DUMP_ONLY', 1); // output elements dump and exit
 //define('PDF_DEBUG_DRAW_BOXES', 1); //
@@ -54,7 +56,10 @@
 	function BuildFromTemplate($template, $template_params = Array ())
 	{
 		$this->Application->InitParser();
-		$xml = $this->Application->Parser->ParseTemplate($template, 1, $template_params);
+
+		$this->Application->Parser->SetParams($template_params);
+		$xml = $this->Application->Parser->Run($template);
+
 		$xml_helper =& $this->Application->recallObject('kXMLHelper');
 		/* @var $xml_helper kXMLHelper */
 
@@ -1004,4 +1009,4 @@
 		$this->SetCSSProperty('padding-bottom', '0');
 	}
 
-}
+}
\ No newline at end of file
Index: branches/5.1.x/core/kernel/utility/adodb-time.inc.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/adodb-time.inc.php	(.../adodb-time.inc.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/adodb-time.inc.php	(.../adodb-time.inc.php)	(revision 12657)
@@ -12,15 +12,12 @@
 and originally found at http://www.php.net/manual/en/function.mktime.php
 
 =============================================================================
+*/
 
+defined('FULL_PATH') or die('restricted access!');
 
-/* Initialization */
+define('ADODB_DATE_VERSION', 0.21);
 
-/*
-	Version Number
-*/
-define('ADODB_DATE_VERSION',0.21);
-
 if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
 
 function adodb_date_test_date($y1,$m,$d=13)
@@ -758,7 +755,4 @@
 	if ($ts === false) $ts = time();
 	$ret = adodb_date($fmtdate, $ts, $is_gmt);
 	return $ret;
-}
-
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_user_group.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_agents.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_ship_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/captcha/captcha_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/captcha/captcha_config.php	(.../captcha_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/captcha/captcha_config.php	(.../captcha_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: captcha_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: captcha_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'captcha',
 //		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_translate.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_currency.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/utility/params.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/params.php	(.../params.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/params.php	(.../params.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: params.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: params.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,132 +12,133 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-class Params extends kBase {
-	var $_Params = Array();
+	defined('FULL_PATH') or die('restricted access!');
 
-	function Params($params_str = null)
-	{
-		parent::kBase();
-		if($params_str != '') $this->SplitParamsStr($params_str);
-	}
+	class Params extends kBase {
 
-	/**
-	 * Splits tag params into associative array
-	 *
-	 * @param string $params_str
-	 * @access private
-	 */
-	function SplitParamsStr($params_str)
-	{
-//		$re = preg_quote('([\${}a-zA-Z0-9_.-#\[\]]+)=(["\']{1,1})(.*?)(?<!\\)\2','/');
-//		preg_match_all('/'.$re.'/s', $params_str, $rets, PREG_SET_ORDER);
-		preg_match_all('/([\${}a-zA-Z0-9_.\\-\\\\#\\[\\]]+)=(["\']{1,1})(.*?)(?<!\\\)\\2/s', $params_str, $rets, PREG_SET_ORDER);
+		var $_Params = Array();
 
-		$values = Array();
-		foreach ($rets AS $key => $val){
-			$values[$val[1]] = str_replace('\\' . $val[2], $val[2], $val[3]);
+		function Params($params_str = null)
+		{
+			parent::kBase();
+			if($params_str != '') $this->SplitParamsStr($params_str);
 		}
-		$this->AddParams($values);
-	}
 
-	/**
-	 * Sets new parameter value
-	 *
-	 * @param string $name
-	 * @param string $val
-	 * @access public
-	 */
-	function Set($name, $val)
-	{
-		$this->_Params[$name] = $val;
-	}
+		/**
+		 * Splits tag params into associative array
+		 *
+		 * @param string $params_str
+		 * @access private
+		 */
+		function SplitParamsStr($params_str)
+		{
+	//		$re = preg_quote('([\${}a-zA-Z0-9_.-#\[\]]+)=(["\']{1,1})(.*?)(?<!\\)\2','/');
+	//		preg_match_all('/'.$re.'/s', $params_str, $rets, PREG_SET_ORDER);
+			preg_match_all('/([\${}a-zA-Z0-9_.\\-\\\\#\\[\\]]+)=(["\']{1,1})(.*?)(?<!\\\)\\2/s', $params_str, $rets, PREG_SET_ORDER);
 
-	/**
-	 * Removes parameter
-	 *
-	 * @param string $name
-	 * @access public
-	 */
-	function Remove($name)
-	{
-		unset($this->_Params[$name]);
-	}
+			$values = Array();
+			foreach ($rets AS $key => $val){
+				$values[$val[1]] = str_replace('\\' . $val[2], $val[2], $val[3]);
+			}
+			$this->AddParams($values);
+		}
 
-	/**
-	 * Gets parameter value by parameter name
-	 *
-	 * @param string $name Name of variable to retrieve
-	 * @param int $default default value returned in case if varible not present
-	 * @return string
-	 * @access public
-	 */
-	function Get($name, $default = false)
-	{
-		return isset($this->_Params[$name]) ? $this->_Params[$name] : $default;
-	}
+		/**
+		 * Sets new parameter value
+		 *
+		 * @param string $name
+		 * @param string $val
+		 * @access public
+		 */
+		function Set($name, $val)
+		{
+			$this->_Params[$name] = $val;
+		}
 
-	/**
-	 * Mass parameter setting from hash
-	 *
-	 * @param Array $params
-	 * @access public
-	 */
-	function AddParams($params)
-	{
-		if (!is_array($params)) return;
-		/*if (count($this->_Params) == 0) {
-			$this->_Params = $params;
+		/**
+		 * Removes parameter
+		 *
+		 * @param string $name
+		 * @access public
+		 */
+		function Remove($name)
+		{
+			unset($this->_Params[$name]);
 		}
-		else {*/
-			foreach ($params as $name => $val)
-//				$this->Set(strtolower($name), $val);
-				$this->Set($name, $val);
-		//}
-	}
 
-	/**
-	 * Return all paramters as hash
-	 *
-	 * @return Array
-	 * @access public
-	 */
-	function GetParams()
-	{
-		return $this->_Params;
-	}
-}
+		/**
+		 * Gets parameter value by parameter name
+		 *
+		 * @param string $name Name of variable to retrieve
+		 * @param int $default default value returned in case if varible not present
+		 * @return string
+		 * @access public
+		 */
+		function Get($name, $default = false)
+		{
+			return isset($this->_Params[$name]) ? $this->_Params[$name] : $default;
+		}
 
-class kArray extends kBase {
-	var $_Array;
+		/**
+		 * Mass parameter setting from hash
+		 *
+		 * @param Array $params
+		 * @access public
+		 */
+		function AddParams($params)
+		{
+			if (!is_array($params)) return;
+			/*if (count($this->_Params) == 0) {
+				$this->_Params = $params;
+			}
+			else {*/
+				foreach ($params as $name => $val)
+	//				$this->Set(strtolower($name), $val);
+					$this->Set($name, $val);
+			//}
+		}
 
-	/**
-	 * Returns array value with any deep key
-	 *
-	 * @return mixed
-	 * @todo array_unshift doesn't accept parameters by reference, fix it's usage in this method
-	 */
-	function GetArrayValue()
-	{
-		$args = func_get_args();
-		array_unshift_ref($args, $this->_Array);
-		return call_user_func_array('getArrayValue', $args);
+		/**
+		 * Return all paramters as hash
+		 *
+		 * @return Array
+		 * @access public
+		 */
+		function GetParams()
+		{
+			return $this->_Params;
+		}
 	}
 
-	function SetArrayValue()
-	{
-		$args = func_get_args();
-		$value = array_pop($args);
+	class kArray extends kBase {
+		var $_Array;
 
-		$arr =& $this->_Array;
-		for ($i=0; $i<count($args); $i++) {
-			$key = $args[$i];
-			if ( !isset($arr[$key]) || !is_array($arr[$key]) ) {
-				$arr[$key] = Array();
-			}
-			$arr =& $arr[$key];
+		/**
+		 * Returns array value with any deep key
+		 *
+		 * @return mixed
+		 * @todo array_unshift doesn't accept parameters by reference, fix it's usage in this method
+		 */
+		function GetArrayValue()
+		{
+			$args = func_get_args();
+			array_unshift_ref($args, $this->_Array);
+			return call_user_func_array('getArrayValue', $args);
 		}
-		$arr = $value;
-	}
-}
 
-?>
\ No newline at end of file
+		function SetArrayValue()
+		{
+			$args = func_get_args();
+			$value = array_pop($args);
+
+			$arr =& $this->_Array;
+			for ($i=0; $i<count($args); $i++) {
+				$key = $args[$i];
+				if ( !isset($arr[$key]) || !is_array($arr[$key]) ) {
+					$arr[$key] = Array();
+				}
+				$arr =& $arr[$key];
+			}
+			$arr = $value;
+		}
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/favorites/favorites_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/favorites/favorites_config.php	(.../favorites_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/favorites/favorites_config.php	(.../favorites_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: favorites_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: favorites_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'fav',
 		'ItemClass'			=>	Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -92,6 +94,4 @@
             'ItemTypeId' => Array('type' => 'int','not_null' => 1, 'default' => 0),
             'Modified' => Array('type' => 'int','not_null' => 1, 'default' => '#NOW#'),
         ),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_goto_order.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_rescan_themes.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/visits/visits_list.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/visits/visits_list.php	(.../visits_list.php)	(revision 12127)
+++ branches/5.1.x/core/units/visits/visits_list.php	(.../visits_list.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_list.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: visits_list.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,61 +12,54 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
 
-class VisitsList extends kDBList
-{
-	/**
-	* Counts the total number of records base on the query resulted from {@link kDBList::GetSelectSQL()}
-	*
-	* The method modifies the query to substitude SELECT part (fields listing) with COUNT(*).
-	* Special care should be applied when working with lists based on grouped queries, all aggregate function fields
-	* like SUM(), AVERAGE() etc. should be added to CountedSQL by using {@link kDBList::SetCountedSQL()}
-	*
-	* @access public
-	* @param string
-	* @return void
-	*/
-	function CountRecs()
-	{
-		$system_sql = $this->GetSelectSQL(true,true);
-		$sql = $this->getCountSQL($system_sql);
-		if( $this->GetGroupClause() )
+	class VisitsList extends kDBList {
+		/**
+		* Counts the total number of records base on the query resulted from {@link kDBList::GetSelectSQL()}
+		*
+		* The method modifies the query to substitude SELECT part (fields listing) with COUNT(*).
+		* Special care should be applied when working with lists based on grouped queries, all aggregate function fields
+		* like SUM(), AVERAGE() etc. should be added to CountedSQL by using {@link kDBList::SetCountedSQL()}
+		*
+		* @access public
+		* @param string
+		* @return void
+		*/
+		function CountRecs()
 		{
-			if (!isset($this->OriginalParams['types']) && $this->Special == 'incommerce') {
-				//$sql = preg_replace('/GROUP BY.*/', '', $sql);
-				$sql = 'SELECT COUNT(*) FROM '.$this->TableName;
-				$this->NoFilterCount = (int)$this->Conn->GetOne($sql);
+			$system_sql = $this->GetSelectSQL(true,true);
+			$sql = $this->getCountSQL($system_sql);
+			if( $this->GetGroupClause() ) {
+				if (!isset($this->OriginalParams['types']) && $this->Special == 'incommerce') {
+					//$sql = preg_replace('/GROUP BY.*/', '', $sql);
+					$sql = 'SELECT COUNT(*) FROM '.$this->TableName;
+					$this->NoFilterCount = (int)$this->Conn->GetOne($sql);
+				}
+				else {
+		    		$this->NoFilterCount = count( $this->Conn->GetCol($sql) );
+				}
 			}
 			else {
-	    	$this->NoFilterCount = count( $this->Conn->GetCol($sql) );
+				$this->NoFilterCount = (int)$this->Conn->GetOne($sql);
 			}
-		}
-		else
-		{
-			$this->NoFilterCount = (int)$this->Conn->GetOne($sql);
-		}
 
-		$all_sql = $this->GetSelectSQL(true,false);
-		if($system_sql == $all_sql) //no need to query the same again
-    {
-    	$this->RecordsCount = $this->NoFilterCount;
-    	return;
-    }
+			$all_sql = $this->GetSelectSQL(true,false);
+			if($system_sql == $all_sql) { //no need to query the same again
+	    		$this->RecordsCount = $this->NoFilterCount;
+	    		return;
+	    	}
 
-		$sql = $this->getCountSQL($all_sql);
+			$sql = $this->getCountSQL($all_sql);
 
-		if( $this->GetGroupClause() )
-		{
-    	$this->RecordsCount = count( $this->Conn->GetCol($sql) );
+			if( $this->GetGroupClause() ) {
+	    		$this->RecordsCount = count( $this->Conn->GetCol($sql) );
+			}
+			else {
+				$this->RecordsCount = (int)$this->Conn->GetOne($sql);
+			}
+
+		    $this->Counted = true;
 		}
-		else
-		{
-			$this->RecordsCount = (int)$this->Conn->GetOne($sql);
-		}
 
-
-
-	    $this->Counted = true;
-	}
-
-}
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/stop_words/stop_word_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/stop_words/stop_word_list.tpl	(.../stop_word_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/stop_words/stop_word_list.tpl	(.../stop_word_list.tpl)	(revision 12657)
@@ -14,7 +14,7 @@
 	  			}
 
 	  			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewStopWord" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							std_precreate_item('stop-word', 'stop_words/stop_word_edit');
 						} ) );
Index: branches/5.1.x/core/units/admin/admin_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: admin_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'adm',
 		'ItemClass' => Array ('class' => 'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
@@ -64,11 +66,11 @@
 
 			'in-portal:service'	=>	Array (
 				'parent'		=>	'in-portal:tools',
-				'icon'			=>	'conf_general',
+				'icon'			=>	'service',
 				'label'			=>	'la_tab_Service',
 				'url'			=>	Array ('t' => 'tools/system_tools', 'pass' => 'm'),
-				'permissions'	=>	Array ('view'),
-				'priority'		=>	10,
+				'permissions'	=>	Array ('view', 'edit'),
+				'priority'		=>	6,
 				'type'			=>	stTREE,
 			),
 		),
@@ -86,7 +88,7 @@
 					'cant_open_file' => '!la_error_CantOpenFile!',
 					'no_matching_columns' => '!la_error_NoMatchingColumns!',
 				),
-				'file_types' => '*.csv', 'files_description' => '!la_CSVFiles!',
+				'file_types' => '*.csv', 'files_description' => '!la_hint_CSVFiles!',
 				'upload_dir' => '/system/import/', // relative to project's home
 				'multiple' => false, 'direct_links' => false,
 				'default' => null,
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_form_submission.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_queue_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: email_queue_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'email-queue',
 		'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -41,11 +43,11 @@
 		'Sections' => Array (
 			'in-portal:email_queue' => Array (
 				'parent'		=>	'in-portal:mailing_folder',
-				'icon'			=>	'email_log',
+				'icon'			=>	'mailing_list',
 				'label'			=>	'la_tab_EmailQueue',
 				'url'			=>	Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'delete'),
-				'priority'		=>	7.2,
+				'priority'		=>	5.2, // <parent_priority>.<own_priority>, because this section replaces parent in tree
 				'type'			=>	stTAB,
 			),
 		),
@@ -74,16 +76,17 @@
 
 		'Grids' => Array (
 			'Default' => Array (
-				'Icons' => Array ('default' => 'icon16_custom.gif'),
+				'Icons' => Array ('default' => 'icon16_item.png'),
 				'Fields' => Array (
-					'EmailQueueId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',),
-					'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', ),
-					'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ),
-					'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', 'filter_block' => 'grid_like_filter', ),
-					'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', ),
-					'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', ),
-					'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', ),
-					'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', ),
+					'EmailQueueId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+					'MailingId' => Array ('title' => 'la_col_MailingList', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+					'ToEmail' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+					'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+					'MessageHeaders' => Array ('title' => 'la_col_MessageHeaders', 'data_block' => 'grid_headers_td', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
+					'Queued' => Array ('title' => 'la_col_Queued', 'filter_block' => 'grid_date_range_filter', 'width' => 80, ),
+					'SendRetries' => Array ('title' => 'la_col_SendRetries', 'filter_block' => 'grid_range_filter', 'width' => 100, ),
+					'LastSendRetry' => Array ('title' => 'la_col_LastSendRetry', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+
 				),
 			),
 		),
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_reset_to_pending_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/utility/factory.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/factory.php	(.../factory.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/factory.php	(.../factory.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: factory.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: factory.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class kFactory extends kBase {
 
 		/**
@@ -105,8 +107,9 @@
 				return $false;
 			}
 
-			if ($this->Application->isDebugMode() && constOn('DBG_FACTORY')) {
+			if (defined('DEBUG_MODE') && defined('DBG_FACTORY') && DBG_FACTORY && $this->Application->isDebugMode()) {
 				global $debugger;
+
 				$debugger->appendHTML('<b>Creating object:</b> Pseudo class: '.$pseudo_class.' Prefix: '.$name);
 				$debugger->appendTrace();
 			}
@@ -158,7 +161,7 @@
 				return $false;
 			}
 
-			if ($this->Application->isDebugMode() && constOn('DBG_FACTORY')) {
+			if (defined('DEBUG_MODE') && defined('DBG_FACTORY') && DBG_FACTORY && $this->Application->isDebugMode()) {
 				global $debugger;
 				$debugger->appendHTML('<b>Creating object:</b> Pseudo class: '.$pseudo_class.' Prefix: '.$name);
 				$debugger->appendTrace();
@@ -324,6 +327,5 @@
 				$dependencies[] = $this->realClasses[$class_name];
 			}
 		}
-	}
 
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/install/site_configs.zip
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_agent_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_theme.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/themes/themes_edit.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/themes/themes_edit.tpl	(.../themes_edit.tpl)	(revision 12657)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="850" height="600"/>
+<inp2:adm_SetPopupSize width="900" height="700"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="themes_edit_general" tab_preset="Default"/>
@@ -58,14 +58,14 @@
 		<inp2:m_RenderElement name="subsection" prefix="theme" fields="ThemeId,Name,Description,Enabled,CacheTimeout,StylesheetId,PrimaryTheme" title="!la_section_General!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="theme" field="ThemeId" title="la_fld_Id"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="theme" field="Name" title="la_fld_Name"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="theme" field="Description" title="la_fld_Description" cols="25" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="theme" field="Description" title="la_fld_Description" cols="25" rows="3"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="theme" field="Enabled" title="la_fld_Enabled"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="theme" field="CacheTimeout" title="la_prompt_lang_cache_timeout"/>
-
+<!--##
 			<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
 				<inp2:m_RenderElement name="inp_edit_options" prefix="theme" field="StylesheetId" title="la_prompt_Stylesheet" has_empty="1"/>
 			</inp2:m_if>
-
+##-->
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="theme" field="PrimaryTheme" title="la_fld_Primary"/>
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/core/units/selectors/selectors_item.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/selectors/selectors_item.php	(.../selectors_item.php)	(revision 12127)
+++ branches/5.1.x/core/units/selectors/selectors_item.php	(.../selectors_item.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: selectors_item.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: selectors_item.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,12 +12,14 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	define('STYLE_INLINE',	' ');
 	define('STYLE_FILE',	"\n");
 	define('STYLE_PREVIEW', '<br>');
-	
-	class SelectorsItem extends kDBItem 
-	{
+
+	class SelectorsItem extends kDBItem	{
+
 		/**
 		 * Returns compiled selector for inserting into css file
 		 *
@@ -30,7 +32,7 @@
 			$ret .= $separator."}\n";
 			return $ret;
 		}
-		
+
 		function CompileStyleBody($separator)
 		{
 			$ret = '';
@@ -43,14 +45,14 @@
 					$ret .= "\t$property_name: $property_value;".$separator;
 				}
 			}
-			
+
 			$advanced_css = $this->GetDBField('AdvancedCSS');
 			if($separator != "\n") $advanced_css = str_replace("\n",$separator,$advanced_css);
 			$ret .= $advanced_css;
-			
+
 			return $ret;
 		}
-		
+
 		/**
 		 * Resets all block style attributes to it's base style
 		 *
@@ -63,5 +65,5 @@
 				$this->Update();
 			}
 		}
-	}
-?>
\ No newline at end of file
+
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/visits/visits_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/visits/visits_event_handler.php	(.../visits_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: visits_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class VisitsEventHandler extends kDBEventHandler {
 
 		/**
@@ -24,31 +26,33 @@
 			$permissions = Array(
 				'OnItemBuild' => Array('self' => true),
 			);
-				
+
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
-		
+
 		/**
 		 * Registers user visit to site
 		 *
 		 * @param kEvent $event
 		 */
 		function OnRegisterVisit(&$event)
 		{
-			if ($this->Application->IsAdmin()) {
+			if ($this->Application->IsAdmin() || !$this->Application->ConfigValue('UseVisitorTracking')) {
 				// admin logins are not registred in visits list
 				return true;
 			}
+
 			if ($this->Application->RecallVar('visit_id')) {
 				return true;
 			}
-			$object =& $event->getObject( Array('skip_autoload'=>true) );
+
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			$object->SetDBField('VisitDate_date', adodb_mktime() );
 			$object->SetDBField('VisitDate_time', adodb_mktime() );
 			$object->SetDBField('Referer', getArrayValue($_SERVER, 'HTTP_REFERER') );
 			$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR'] );
-			if( $object->Create() )
-			{
+
+			if ($object->Create()) {
 				$this->Application->StoreVar('visit_id', $object->GetID() );
 				$this->Application->SetVar('visits_id', $object->GetID() );
 			}
@@ -113,7 +117,7 @@
 				}
 			}
 		}
-		
+
 		/**
 		 * [HOOK] Updates user_id in current visit
 		 *
@@ -130,6 +134,4 @@
 			}
 		}
 
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_custom.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_language_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: custom_fields_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'cf',
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
@@ -122,38 +124,44 @@
 										),
 
 					'Grids'	=> Array(
-										'Default'		=>	Array(
-																	'Icons' => Array('default'=>'icon16_custom.gif'),
-																	'Fields' => Array(
-																			'CustomFieldId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter' ),
-																			'FieldName' => Array( 'title'=>'la_prompt_FieldName'),
-																			'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ),
-																			'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder', 'filter_block' => 'grid_range_filter' ),
-//																			'IsSystem' => Array ('title' => 'la_col_IsSystem', 'filter_block' => 'grid_options_filter'),
-																		),
-															),
+										'Default' => Array (
+											'Icons' => Array (
+												'default' => 'icon16_item.png',
+											),
+											'Fields' => Array (
+												'CustomFieldId' => Array ( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+												'FieldName' => Array ( 'title'=>'la_prompt_FieldName', 'width' => 250, ),
+												'FieldLabel' => Array ( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td', 'width' => 250, ),
+												'DisplayOrder' => Array ('title' => 'la_prompt_DisplayOrder', 'filter_block' => 'grid_range_filter', 'width' => 105, ),
+//												'IsSystem' => Array ('title' => 'la_col_IsSystem', 'filter_block' => 'grid_options_filter'),
+											),
+										),
 
-										'SeparateTab'	=>	Array(
-																	'Icons' => Array('default'=>'icon16_custom.gif'),
-																	'Selector' => '',
-																	'Fields' => Array(
-																			'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
-																			'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType', 'filter_block' => 'grid_empty_filter'),
-																			'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td', 'filter_block' => 'grid_empty_filter'),
-																			'Error' => Array( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td', 'filter_block' => 'grid_empty_filter'),
-																		),
-															),
+										'SeparateTab' => Array (
+											'Icons' => Array (
+												'default' => 'icon16_item.png',
+											),
+											'Selector' => '',
+											'Fields' => Array (
+												'FieldName' => Array ( 'title'=>'la_col_FieldName', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+												'Prompt' => Array ( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType', 'filter_block' => 'grid_empty_filter', 'width' => 200, ),
+												'Value' => Array ( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td', 'filter_block' => 'grid_empty_filter', 'width' => 200, ),
+												'Error' => Array ( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td', 'filter_block' => 'grid_empty_filter', 'width' => 100, ),
+											),
+										),
 
-										'SeparateTabOriginal'	=>	Array(
-																			'Icons' => Array('default'=>'icon16_custom.gif'),
-																			'Selector' => '',
-																			'Fields' => Array(
-																					'FieldName'		=>	Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td', 'filter_block' => 'grid_like_filter'),
-																					'Prompt'		=>	Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType', 'filter_block' => 'grid_empty_filter'),
-																					'Value'			=>	Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td', 'filter_block' => 'grid_empty_filter'),
-																					'OriginalValue'	=>	Array( 'title'=>'la_col_OriginalValue', 'data_block' => 'grid_original_td', 'filter_block' => 'grid_like_filter'),
-																				),
-																	),
+										'SeparateTabOriginal' => Array (
+											'Icons' => Array (
+												'default' => 'icon16_item.png',
+											),
+											'Selector' => '',
+											'Fields' => Array (
+												'FieldName' => Array ( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td', 'filter_block' => 'grid_like_filter'),
+												'Prompt' =>	Array ( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType', 'filter_block' => 'grid_empty_filter'),
+												'Value' => Array ( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td', 'filter_block' => 'grid_empty_filter'),
+												'OriginalValue'	=> Array ( 'title'=>'la_col_OriginalValue', 'data_block' => 'grid_original_td', 'filter_block' => 'grid_like_filter'),
+											),
+										),
 
 								),
 	);
\ No newline at end of file
Index: branches/5.1.x/core/units/general/custom_fields.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/general/custom_fields.php	(revision 12127)
+++ branches/5.1.x/core/units/general/custom_fields.php	(revision 0)
@@ -1,157 +0,0 @@
-<?php
-/**
-* @version	$Id: custom_fields.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-/**
- * Enter description here...
- *
- * @todo rewrite
- */
-class InpCustomFieldsHelper extends kHelper {
-
-	/**
-	 * Parses given option string and returns associative array
-	 *
-	 * @param string $values_list
-	 * @param string $separator
-	 * @param bool $parse
-	 * @return Array
-	 */
-	function GetValuesHash($values_list, $separator = VALUE_LIST_SEPARATOR, $parse = true)
-	{
-		$values_list = trim($this->ParseConfigSQL($values_list, $separator, $parse), $separator);
-
-		if (!$values_list) {
-			// no options, then return empty array
-			return Array();
-		}
-
-		$optionValuesTmp = explode($separator, $values_list);
-		$optionValues = Array();
-
-		if (substr_count($values_list, '=') != count($optionValuesTmp)) {
-			if ($this->Application->isDebugMode()) {
-				$this->Application->Debugger->appendTrace();
-			}
-
-			trigger_error('Invalid symbol in ValueList field [' . substr($values_list, 0, 100) . ' ...]' , E_USER_NOTICE);
-			return Array ();
-		}
-
-		if ($parse) {
-			// normal way
-			foreach ($optionValuesTmp as $optionValue) {
-				list ($key, $val) = explode('=', $optionValue);
-
-				$val = substr($val, 0, 1) == '+' ? substr($val, 1) : $this->Application->Phrase($val);
-
-				$optionValues[$key] = $val;
-			}
-		}
-		else {
-			// during custom field editing
-			foreach ($optionValuesTmp as $optionValue) {
-				list ($key, $val) = explode('=', $optionValue);
-
-				if (substr($key, 0, 3) == 'SQL') {
-					$val = base64_decode( str_replace('_', '=', substr($val, 1)) );
-				}
-
-				$optionValues[$key] = $val;
-			}
-		}
-
-		return $optionValues;
-	}
-
-	/**
-	 * Replace SQL's in valueList with appropriate queried values
-	 *
-	 * @param string $valueString
-	 * @param string $separator
-	 * @return string
-	 * @todo Apply refactoring to embedded vars stuff
-	 */
-	function ParseConfigSQL($valueString, $separator = VALUE_LIST_SEPARATOR, $parse_sqls = true)
-	{
-		$string = trim( str_replace(Array('<PREFIX>', '%3$s'), Array (TABLE_PREFIX, $this->Application->GetVar('m_lang')), $valueString) );
-
-		preg_match_all("|\{(.*)\}|U", $string, $embedded_vars, PREG_SET_ORDER);
-
-		/*
-		<SQL> in ValueList now can use globally available variables.
-		Usage: {$_POST['variable']|what to output if $_POST['variable'] is set}
-		e.g. $_POST['variable']='Hello'
-		Will output: what to output if Hello is set
-		*/
-
-		if ($embedded_vars) {
-			for ($i = 0; $i < count($embedded_vars); $i++) {
-				$embedded_var = $embedded_vars[$i][1];
-				$embedded_var_src = $embedded_vars[$i][0];
-
-				list($var_name, $pattern) = explode('|', $embedded_var);
-				eval('$var_value = (isset('.$var_name.')?'.$var_name.':false);');
-
-				if ($var_value !== false) {
-					$pattern = str_replace($var_name, $var_value, $pattern);
-					$string = str_replace($embedded_var_src, $pattern, $string);
-				}
-				else {
-					$string = str_replace($embedded_var_src, '', $string);
-				}
-			}
-		}
-
-		if (preg_match_all('/<SQL([+]{0,1})>(.*?)<\/SQL>/', $string, $regs)) {
-			$i = 0;
-			$sql_count = count($regs[0]);
-			while ($i < $sql_count) {
-				if ($parse_sqls) {
-					$replacement = $this->_queryConfigSQL($regs[2][$i], $regs[1][$i], $separator);
-				}
-				else {
-					$sql = base64_encode('<SQL'.$regs[1][$i].'>'.$regs[2][$i].'</SQL>');
-					$replacement = 'SQL' . $i . '=+' . str_replace('=', '_', $sql);
-				}
-
-				$string = str_replace('<SQL'.$regs[1][$i].'>'.$regs[2][$i].'</SQL>', $replacement, $string);
-				$i++;
-			}
-
-			$string = preg_replace('/[' . preg_quote($separator, '/') . ']+/', $separator, $string); // trim trailing separators inside string
-		}
-
-		return $string;
-	}
-
-	/**
-	 * Transforms given sql into value list string
-	 *
-	 * @param string $sql
-	 * @param string $plus
-	 * @param string $separator
-	 * @return string
-	 */
-	function _queryConfigSQL($sql, $plus = '', $separator = VALUE_LIST_SEPARATOR)
-	{
-		$values = $this->Conn->Query($sql);
-		foreach ($values as $index => $value) {
-			$values[$index] = $value['OptionValue'] . '=' . $plus . $value['OptionName'];
-		}
-
-		return implode($separator, $values);
-	}
-}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_group.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/utility/debugger/debugger.css
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/debugger/debugger.css	(.../debugger.css)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/debugger/debugger.css	(.../debugger.css)	(revision 12657)
@@ -86,13 +86,15 @@
 	border: 1px solid #000000;
 	background-color: #D4D0C8;
 	border-collapse: separate;
+	border-spacing: 2px;
 	width: auto;
 }
 
 .dbg-toolbar td {
 	font-size: 13px;
 	font-family: Tahoma;
 	padding: 1px 5px 1px 5px;
+	vertical-align: middle;
 	margin: 3px;
 }
 
Index: branches/5.1.x/core/admin_templates/img/tab_active_right.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/startup.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/startup.php	(.../startup.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/startup.php	(.../startup.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: startup.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,29 +12,27 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	define('KERNEL_PATH', FULL_PATH . '/core/kernel');
-	if (file_exists(FULL_PATH . '/kernel/kernel4/application.php')) {
-		die('Please remove ' . FULL_PATH . '/kernel/kernel4 directiry - it has been moved to ' . KERNEL_PATH . '<br/>Don\'t forget to clean Cache table afterwards');
-	}
 
 	if (!function_exists('getmicrotime')) {
 		function getmicrotime()
 		{
-	    list($usec, $sec) = explode(" ", microtime());
-	    return ((float)$usec + (float)$sec);
+			list($usec, $sec) = explode(" ", microtime());
+			return ((float)$usec + (float)$sec);
 		}
 	}
+
 	$globals_start = getmicrotime();
 	include_once(KERNEL_PATH . '/globals.php');	// non OOP functions used through kernel, e.g. print_pre
 	include_once(KERNEL_PATH . '/utility/multibyte.php');	// emulating multi-byte php extension
 	$globals_end = getmicrotime();
 
-	define('INPORTAL_ENV', 1);
-
 	$vars = parse_portal_ini(FULL_PATH . '/config.php');
 
 	$admin_directory = isset($vars['AdminDirectory']) ? $vars['AdminDirectory'] : '/admin';
-	safeDefine('ADMIN_DIRECTORY', $admin_directory);
+	define('ADMIN_DIRECTORY', $admin_directory);
 
 	# New path detection method: begin
 	if (defined('REL_PATH')) {
@@ -51,8 +49,6 @@
 	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
 	# New path detection method: end
 
-	safeDefine('INPORTAL_TAGS', true);
-	safeDefine('NPARSER', 1); // New Parser is enabled
 	safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : $vars['Domain']);
 
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
@@ -93,32 +89,32 @@
 
 	define('MODULES_PATH', FULL_PATH);
 
-	define('EXPORT_BASE_PATH', (defined('WRITEBALE_BASE') ? WRITEBALE_BASE : ADMIN_DIRECTORY) . '/export');
+	define('EXPORT_BASE_PATH', WRITEBALE_BASE . '/export');
 	define('EXPORT_PATH', FULL_PATH . EXPORT_BASE_PATH);
 
 	define('GW_CLASS_PATH', MODULES_PATH . '/in-commerce/units/gateways/gw_classes'); // Payment Gateway Classes Path
 	define('SYNC_CLASS_PATH', FULL_PATH . '/sync');	// path for 3rd party user syncronization scripts
 
 	safeDefine('ENV_VAR_NAME','env');
 
-	safeDefine('IMAGES_PATH', (defined('WRITEBALE_BASE') ? WRITEBALE_BASE : '/kernel') . '/images/');
-	safeDefine('IMAGES_PENDING_PATH', IMAGES_PATH . 'pending/');
-	safeDefine('CUSTOM_UPLOAD_PATH', '/templates/images/custom/');
+	define('IMAGES_PATH', WRITEBALE_BASE . '/images/');
+	define('IMAGES_PENDING_PATH', IMAGES_PATH . 'pending/');
 	safeDefine('MAX_UPLOAD_SIZE', min(ini_get('upload_max_filesize'), ini_get('post_max_size'))*1024*1024);
 
 	safeDefine('EDITOR_PATH', isset($vars['EditorPath']) ? $vars['EditorPath'] : '/core/editor/');
 
-	if( ini_get('safe_mode') ) define('SAFE_MODE', 1);
+	if (ini_get('safe_mode')) {
+		// safe mode will be removed at all in PHP6
+		define('SAFE_MODE', 1);
+	}
 
-	safeDefine('EXPERIMENTAL_PRE_PARSE', 1);
-
-	if( file_exists(FULL_PATH . '/debug.php') )
-	{
+	if (file_exists(FULL_PATH . '/debug.php')) {
 		include_once(FULL_PATH . '/debug.php');
-		if(isset($dbg_options['DEBUG_MODE']) && $dbg_options['DEBUG_MODE']) {
+		if (array_key_exists('DEBUG_MODE', $dbg_options) && $dbg_options['DEBUG_MODE']) {
 			$debugger_start = getmicrotime();
 			include_once(KERNEL_PATH . '/utility/debugger.php');
 			$debugger_end = getmicrotime();
+
 			if (isset($debugger) && constOn('DBG_PROFILE_INCLUDES')) {
 				$debugger->profileStart('inc_globals', KERNEL_PATH . '/globals.php', $globals_start);
 				$debugger->profileFinish('inc_globals', KERNEL_PATH . '/globals.php', $globals_end);
@@ -130,7 +126,7 @@
 			}
 		}
 	}
-	
+
 	safeDefine('SILENT_LOG', 0);
 
 	$includes = Array(
@@ -155,14 +151,10 @@
 		$debugger->AttachToApplication();
 	}
 
-	if( !function_exists('adodb_mktime') ) include_once(KERNEL_PATH . '/utility/adodb-time.inc.php');
+	if( !function_exists('adodb_mktime') ) {
+		include_once(KERNEL_PATH . '/utility/adodb-time.inc.php');
+	}
 
-//	include_once(KERNEL_PATH . '/utility/temp_handler.php'); // needed because of static calls from kBase
-	// up to here
-
 	// global constants
 	define ('KG_TO_POUND', 2.20462262);
-	define ('POUND_TO_KG', 0.45359237);
-
-
-?>
\ No newline at end of file
+	define ('POUND_TO_KG', 0.45359237);
\ No newline at end of file
Index: branches/5.1.x/core/units/user_groups/user_groups_dbitem.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/user_groups/user_groups_dbitem.php	(.../user_groups_dbitem.php)	(revision 12127)
+++ branches/5.1.x/core/units/user_groups/user_groups_dbitem.php	(.../user_groups_dbitem.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_groups_dbitem.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: user_groups_dbitem.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,8 +12,10 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-	class UserGroups_DBItem extends kDBItem
-	{
+	defined('FULL_PATH') or die('restricted access!');
+
+	class UserGroups_DBItem extends kDBItem	{
+
 		/**
 		* Returns part of SQL WHERE clause identifing the record, ex. id = 25
 		*
@@ -37,7 +39,4 @@
 			return parent::GetKeyClause($method, $keys_hash);
 		}
 
-	}
-
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/modules/modules_tag_processor.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/modules/modules_tag_processor.php	(.../modules_tag_processor.php)	(revision 12127)
+++ branches/5.1.x/core/units/modules/modules_tag_processor.php	(.../modules_tag_processor.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: modules_tag_processor.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: modules_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,15 +12,27 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class ModulesTagProcessor extends kDBTagProcessor  {
 
 		function ModuleInstalled($params)
 		{
 			return $this->Application->isModuleEnabled($params['name']);
 		}
 
+		function _hasPrivileges()
+		{
+			return $this->Application->RecallVar('user_id') == -1;
+		}
+
 		function AlreadyInstalled($params)
 		{
+			if (!$this->_hasPrivileges()) {
+				// don't show licenses status for non-privileged users
+				return true;
+			}
+
 			$object =& $this->getObject($params);
 			/* @var $object kDBList */
 
@@ -32,6 +44,11 @@
 
 		function ModuleLicensed($params)
 		{
+			if (!$this->_hasPrivileges()) {
+				// don't show licenses status for non-privileged users
+				return true;
+			}
+
 			$object =& $this->getObject($params);
 			/* @var $object kDBList */
 
@@ -96,4 +113,5 @@
 
 			return $this->Application->HREF('dummy', '_FRONT_END_', $url_params, $module_path . '/install.php');
 		}
-	}
+
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_summary.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_settings_search.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/user_profile/user_profile_eh.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/user_profile/user_profile_eh.php	(.../user_profile_eh.php)	(revision 12127)
+++ branches/5.1.x/core/units/user_profile/user_profile_eh.php	(.../user_profile_eh.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_profile_eh.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: user_profile_eh.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class UserProfileEventHandler extends kDBEventHandler {
 
 		/**
@@ -49,7 +51,4 @@
 			}
 		}
 
-
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/forms/forms_edit_fields.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/forms/forms_edit_fields.tpl	(.../forms_edit_fields.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/forms/forms_edit_fields.tpl	(.../forms_edit_fields.tpl)	(revision 12657)
@@ -39,7 +39,7 @@
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_FormField" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_FormField" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							std_new_item('formflds', 'forms/form_field_edit')
 						} ) );
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_conf_themes.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_form_submission_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_users.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_arrange.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/category_items/category_items_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/category_items/category_items_event_handler.php	(.../category_items_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/category_items/category_items_event_handler.php	(.../category_items_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: category_items_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: category_items_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class CategoryItemsEventHander extends kDBEventHandler
 	{
 
@@ -134,6 +136,4 @@
 			}
 		}
 
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/general/libchart/classes/view/primitive/Rectangle.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/primitive/Rectangle.php	(.../Rectangle.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/primitive/Rectangle.php	(.../Rectangle.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * A rectangle identified by the top-left and the bottom-right corners.
 	 *
@@ -72,5 +74,4 @@
 			//echo "(" . $this->x1 . "," . $this->y1 . ") (" . $this->x2 . "," . $this->y2 . ")<br>";
 			return $rectangle;
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/spelling_dictionary/spelling_dictionary_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/spelling_dictionary/spelling_dictionary_config.php	(.../spelling_dictionary_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/spelling_dictionary/spelling_dictionary_config.php	(.../spelling_dictionary_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: spelling_dictionary_config.php 11902 2009-07-15 01:07:23Z dmitrya $
+* @version	$Id: spelling_dictionary_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'spelling-dictionary',
 		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -52,6 +54,7 @@
 
 		'PermSection' => Array('main' => 'in-portal:spelling_dictionary'),
 
+	/*
 		'Sections' => Array (
 			'in-portal:spelling_dictionary' => Array (
 				'parent'		=>	'in-portal:website_setting_folder',
@@ -63,6 +66,7 @@
 				'type'			=>	stTREE,
 			),
 		),
+	*/
 
 		'ListSQLs' => Array (
 			'' => '	SELECT %1$s.* %2$s FROM %1$s',
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_group_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_agents.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_settings_general.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_style.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/content/content_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/content/content_config.php	(.../content_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/content/content_config.php	(.../content_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: content_config.php 11897 2009-07-08 16:50:24Z alex $
+* @version	$Id: content_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'content',
 		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_style_disabled.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/general/cat_dbitem.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/general/cat_dbitem.php	(revision 12127)
+++ branches/5.1.x/core/units/general/cat_dbitem.php	(revision 0)
@@ -1,598 +0,0 @@
-<?php
-/**
-* @version	$Id: cat_dbitem.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-class kCatDBItem extends kDBItem {
-
-	/**
-	 * Category path, needed for import
-	 *
-	 * @var Array
-	 */
-	var $CategoryPath = Array();
-
-	/**
-	 * Use automatic filename generation
-	 *
-	 * @var bool
-	 */
-	var $useFilenames = true;
-
-	/**
-	 * Use pending editing abilities during item (delegated by permissions)
-	 *
-	 * @var bool
-	 */
-	var $usePendingEditing = false;
-
-	function Clear($new_id = null)
-	{
-		parent::Clear($new_id);
-		$this->CategoryPath = 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->usePendingEditing = $this->Application->getUnitOption($this->Prefix, 'UsePendingEditing');
-	}
-
-	function Create($force_id = false, $system_create = false)
-	{
-		// TODO: move to OnBeforeItemCreate method
-		if ($this->Validate()) {
-			// TODO: such approach will not respect changes from OnBeforeItemCreate event
-			$this->SetDBField('ResourceId', $this->Application->NextResourceId());
-		}
-
-		$this->SetDBField('Modified_date', adodb_mktime() );
-		$this->SetDBField('Modified_time', adodb_mktime() );
-
-		if ($this->mode != 't' && !$this->Application->IsAdmin()) {
-			$owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField');
-			if (!$owner_field) {
-				$owner_field = 'CreatedById';
-			}
-			$this->SetDBField($owner_field, $this->Application->RecallVar('user_id'));
-		}
-
-		if ($this->useFilenames) {
-			$this->checkFilename();
-			$this->generateFilename();
-		}
-
-		$ret = parent::Create($force_id, $system_create);
-
-		if ($ret) {
-			// TODO: move to OnAfterItemCreate method
-			$this->assignPrimaryCategory();
-		}
-		return $ret;
-	}
-
-	function assignPrimaryCategory()
-	{
-		$primary_category = $this->GetDBField('CategoryId') > 0 ? $this->GetDBField('CategoryId') : $this->Application->GetVar('m_cat_id');
-		$this->assignToCategory($primary_category, true);
-	}
-
-	function Update($id=null, $system_update=false)
-	{
-		$this->VirtualFields['ResourceId'] = Array();
-		$this->SetDBField('Modified', adodb_mktime() );
-		$this->UpdateFormattersSubFields(array('Modified'));
-		$this->SetDBField('ModifiedById', $this->Application->RecallVar('user_id'));
-
-		if ($this->useFilenames) {
-			$this->checkFilename();
-			$this->generateFilename();
-		}
-
-		$ret = parent::Update($id, $system_update);
-
-		if ($ret) {
-			$filename = $this->useFilenames ? $this->GetDBField('Filename') : '';
-			$sql = 'UPDATE '.$this->CategoryItemsTable().'
-					SET Filename = '.$this->Conn->qstr($filename).'
-					WHERE ItemResourceId = '.$this->GetDBField('ResourceId');
-			$this->Conn->Query($sql);
-		}
-
-		unset($this->VirtualFields['ResourceId']);
-		return $ret;
-	}
-
-	/**
-	 * Returns CategoryItems table based on current item mode (temp/live)
-	 *
-	 * @return string
-	 */
-	function CategoryItemsTable()
-	{
-		$table = TABLE_PREFIX.'CategoryItems';
-		if ($this->Application->IsTempTable($this->TableName)) {
-			$table = $this->Application->GetTempName($table, 'prefix:'.$this->Prefix);
-		}
-
-		return $table;
-	}
-
-
-	function checkFilename()
-	{
-		if( !$this->GetDBField('AutomaticFilename') )
-		{
-			$filename = $this->GetDBField('Filename');
-			$this->SetDBField('Filename', $this->stripDisallowed($filename) );
-		}
-	}
-
-	function Copy($cat_id=null)
-	{
-		if (!isset($cat_id)) $cat_id = $this->Application->GetVar('m_cat_id');
-		$this->NameCopy($cat_id);
-		return $this->Create($cat_id);
-	}
-
-	function NameCopy($master=null, $foreign_key=null)
-	{
-		$title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField');
-		if (!$title_field) return;
-
-		$new_name = $this->GetDBField($title_field);
-		$cat_id = $this->Application->GetVar('m_cat_id');
-		$original_checked = false;
-		do {
-			if ( preg_match('/Copy ([0-9]*) *of (.*)/', $new_name, $regs) ) {
-				$new_name = 'Copy '.( (int)$regs[1] + 1 ).' of '.$regs[2];
-			}
-			elseif ($original_checked) {
-				$new_name = 'Copy of '.$new_name;
-			}
-			$query = 'SELECT '.$title_field.' FROM '.$this->TableName.'
-								LEFT JOIN '.TABLE_PREFIX.'CategoryItems ON
-								('.TABLE_PREFIX.'CategoryItems.ItemResourceId = '.$this->TableName.'.ResourceId)
-								WHERE ('.TABLE_PREFIX.'CategoryItems.CategoryId = '.$cat_id.') AND '.
-								$title_field.' = '.$this->Conn->qstr($new_name);
-			$res = $this->Conn->GetOne($query);
-			$original_checked = true;
-		} while ($res !== false);
-		$this->SetDBField($title_field, $new_name);
-
-		// this is needed, because Create will create items in its own CategoryId (if it's set),
-		// but we need to create it in target Paste category @see{kCatDBItem::Create} and its primary_category detection
-		$this->SetDBField('CategoryId', $cat_id);
-	}
-
-	/**
-	 * Changes item primary category to given/current category
-	 *
-	 * @param int $category_id
-	 */
-	function MoveToCat($category_id = null)
-	{
-//		$this->NameCopy();
-		if (!isset($category_id)) {
-			$category_id = $this->Application->GetVar('m_cat_id');
-		}
-
-		$table_name = TABLE_PREFIX . 'CategoryItems';
-		if ($this->IsTempTable()) {
-			$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
-		}
-
-		// check if the item already exists in destination category
-		$sql = 'SELECT PrimaryCat
-				FROM ' . $table_name . '
-				WHERE (CategoryId = ' . $category_id . ') AND (ItemResourceId = ' . $this->GetDBField('ResourceId') . ')';
-		$is_primary = $this->Conn->GetOne($sql);
-
-		// if it's not found is_primary will be FALSE, if it's found but not primary it will be int 0
-		$exists = $is_primary !== false;
-
-		if ($exists) {
-			// if the item already exists in destination category
-			if ($is_primary) {
-				// do nothing when we paste to primary
-				return ;
-			}
-
-			// if it's not primary - delete it from destination category, as we will move it from current primary below
-			$sql = 'DELETE FROM ' . $table_name . '
-					WHERE (CategoryId = ' . $category_id . ') AND (ItemResourceId = ' . $this->GetDBField('ResourceId') . ')';
-			$this->Conn->Query($sql);
-		}
-
-		// change category id in existing primary category record
-		$sql = 'UPDATE ' . $table_name . '
-				SET CategoryId = ' . $category_id . '
-				WHERE (ItemResourceId = ' . $this->GetDBField('ResourceId') . ') AND (PrimaryCat = 1)';
-		$this->Conn->Query($sql);
-
-		$this->Update();
-	}
-
-	/**
-	 * When item is deleted, then also delete it from all categories
-	 *
-	 * @param int $id
-	 * @return bool
-	 */
-	function Delete($id = null)
-	{
-		if( isset($id) ) {
-			$this->setID($id);
-		}
-
-		$this->Load($this->GetID());
-
-		$ret = parent::Delete();
-
-		if ($ret) {
-			// TODO: move to OnAfterItemDelete method
-			$query = '	DELETE FROM ' . $this->CategoryItemsTable() . '
-						WHERE ItemResourceId = ' . $this->GetDBField('ResourceId');
-			$this->Conn->Query($query);
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Deletes item from categories
-	 *
-	 * @param Array $delete_category_ids
-	 * @author Alex
-	 */
-	function DeleteFromCategories($delete_category_ids)
-	{
-		$id_field = $this->Application->getUnitOption($this->Prefix, 'IDField'); // because item was loaded before by ResourceId
-
-		$ci_table = $this->Application->getUnitOption($this->Prefix.'-ci', 'TableName');
-		$resource_id = $this->GetDBField('ResourceId');
-
-		$item_cats_sql = 'SELECT CategoryId FROM %s WHERE ItemResourceId = %s';
-		$delete_category_items_sql = 'DELETE FROM %s WHERE ItemResourceId = %s AND CategoryId IN (%s)';
-
-		$category_ids = $this->Conn->GetCol( sprintf($item_cats_sql, $ci_table, $resource_id) );
-		$cats_left = array_diff($category_ids, $delete_category_ids);
-		if(!$cats_left)
-		{
-			$sql = 'SELECT %s FROM %s WHERE ResourceId = %s';
-			$ids = $this->Conn->GetCol( sprintf($sql, $id_field, $this->TableName, $resource_id) );
-
-			$temp =& $this->Application->recallObject($this->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
-			$temp->DeleteItems($this->Prefix, $this->Special, $ids);
-		}
-		else
-		{
-			$this->Conn->Query( sprintf($delete_category_items_sql, $ci_table, $resource_id, implode(',', $delete_category_ids) ) );
-
-			$sql = 'SELECT CategoryId FROM %s WHERE PrimaryCat = 1 AND ItemResourceId = %s';
-			$primary_cat_id = $this->Conn->GetCol( sprintf($sql, $ci_table, $resource_id) );
-			if( count($primary_cat_id) == 0 )
-			{
-				$sql = 'UPDATE %s SET PrimaryCat = 1 WHERE (CategoryId = %s) AND (ItemResourceId = %s)';
-				$this->Conn->Query( sprintf($sql, $ci_table, reset($cats_left), $resource_id ) );
-			}
-		}
-	}
-
-	/**
-	 * replace not allowed symbols with "_" chars + remove duplicate "_" chars in result
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	function stripDisallowed($filename)
-	{
-		$filenames_helper =& $this->Application->recallObject('FilenamesHelper');
-		$table = $this->mode == 't' ? $this->Application->GetTempName(TABLE_PREFIX.'CategoryItems', 'prefix:'.$this->Prefix) : TABLE_PREFIX.'CategoryItems';
-
-		return $filenames_helper->stripDisallowed($table, 'ItemResourceId', $this->GetDBField('ResourceId'), $filename);
-	}
-
-	/* commented out because it's called only from stripDisallowed body, which is moved to helper
-
-	function checkAutoFilename($filename)
-	{
-		$filenames_helper =& $this->Application->recallObject('FilenamesHelper');
-		return $filenames_helper->checkAutoFilename($this->TableName, $this->IDField, $this->GetID(), $filename);
-	}*/
-
-	/**
-	 * Generate item's filename based on it's title field value
-	 *
-	 * @return string
-	 */
-	function generateFilename()
-	{
-		if ( !$this->GetDBField('AutomaticFilename') && $this->GetDBField('Filename') ) return false;
-
-		$title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField');
-		if (preg_match('/l([\d]+)_(.*)/', $title_field, $regs)) {
-			// if title field is multilingual, then use it's name from primary language
-			$title_field = 'l'.$this->Application->GetDefaultLanguageId().'_'.$regs[2];
-		}
-		$name = $this->stripDisallowed( $this->GetDBField($title_field) );
-
-		if ( $name != $this->GetDBField('Filename') ) $this->SetDBField('Filename', $name);
-	}
-
-	/**
-	 * Check if value is set for required field
-	 *
-	 * @param string $field field name
-	 * @param Array $params field options from config
-	 * @return bool
-	 * @access private
-	 */
-	function ValidateRequired($field, $params)
-	{
-		$res = true;
-		if (getArrayValue($params, 'required')) {
-			$res = ( (string) $this->FieldValues[$field] != '');
-		}
-		if (!$res) {
-			$this->SetError($field, 'required');
-		}
-		return $res;
-	}
-
-	/**
-	 * Adds item to other category
-	 *
-	 * @param int $category_id
-	 * @param bool $is_primary
-	 */
-	function assignToCategory($category_id, $is_primary = false)
-	{
-		$table = $this->CategoryItemsTable();
-		$key_clause = '(ItemResourceId = '.$this->GetDBField('ResourceId').')';
-
-		// get all cateories, where item is in
-		$sql = 'SELECT PrimaryCat, CategoryId FROM '.$table.' WHERE '.$key_clause;
-		$item_categories = $this->Conn->GetCol($sql, 'CategoryId');
-		if (!$item_categories) {
-			$item_categories = Array();
-			$primary_found = false;
-		}
-
-		// find primary category
-		foreach ($item_categories as $item_category_id => $primary_found) {
-			if ($primary_found) {
-				break;
-			}
-		}
-
-		if ($primary_found && ($item_category_id == $category_id) && !$is_primary) {
-			// want to make primary category as non-primary :(
-			return true;
-		}
-		else if (!$primary_found) {
-			$is_primary = true;
-		}
-
-		if ($is_primary && $item_categories) {
-			// reset primary mark from all other categories
-			$sql = 'UPDATE '.$table.' SET PrimaryCat = 0 WHERE '.$key_clause;
-			$this->Conn->Query($sql);
-		}
-
-		// UPDATE & INSERT instead of REPLACE because CategoryItems table has no primary key defined in database
-		if (isset($item_categories[$category_id])) {
-			$sql = 'UPDATE '.$table.' SET PrimaryCat = '.($is_primary ? 1 : 0).' WHERE '.$key_clause.' AND (CategoryId = '.$category_id.')';
-			$this->Conn->Query($sql);
-		}
-		else {
-			$fields_hash = 	Array(
-				'CategoryId'		=>	$category_id,
-				'ItemResourceId'	=>	$this->GetField('ResourceId'),
-				'PrimaryCat'		=>	$is_primary ? 1 : 0,
-				'ItemPrefix'		=>	$this->Prefix,
-				'Filename'			=>	$this->useFilenames ? $this->GetDBField('Filename') : '', // because some prefixes does not use filenames,
-			);
-			$this->Conn->doInsert($fields_hash, $table);
-		}
-		// to ensure filename update after adding to another category
-		// this is critical since there may be an item with same filename in newly added category!
-		$this->Update();
-	}
-
-	/**
-	 * Removes item from category specified
-	 *
-	 * @param int $category_id
-	 */
-	function removeFromCategory($category_id)
-	{
-		$sql = 'DELETE FROM '.TABLE_PREFIX.'CategoryItems WHERE (CategoryId = %s) AND (ItemResourceId = %s)';
-		$this->Conn->Query( sprintf($sql, $category_id, $this->GetDBField('ResourceId')) );
-	}
-
-	/**
-	 * Returns list of columns, that could exist in imported file
-	 *
-	 * @return Array
-	 */
-	function getPossibleExportColumns()
-	{
-		static $columns = null;
-		if (!is_array($columns)) {
-			$columns = array_merge($this->Fields['AvailableColumns']['options'], $this->Fields['ExportColumns']['options']);
-		}
-		return $columns;
-	}
-
-	/**
-	 * Returns item's primary image data
-	 *
-	 * @return Array
-	 */
-	function getPrimaryImageData()
-	{
-		$sql = 'SELECT *
-				FROM '.TABLE_PREFIX.'Images
-				WHERE (ResourceId = '.$this->GetDBField('ResourceId').') AND (DefaultImg = 1)';
-		$image_data = $this->Conn->GetRow($sql);
-		if (!$image_data) {
-			// 2. no primary image, then get image with name "main"
-			$sql = 'SELECT *
-				FROM '.TABLE_PREFIX.'Images
-				WHERE (ResourceId = '.$this->GetDBField('ResourceId').') AND (Name = "main")';
-			$image_data = $this->Conn->GetRow($sql);
-		}
-		return $image_data;
-	}
-
-	function ChangeStatus($new_status)
-	{
-		$status_field = array_shift( $this->Application->getUnitOption($this->Prefix,'StatusField') );
-		if ($new_status != $this->GetDBField($status_field)) {
-			// status was changed
-			$this->sendEmailEvents($new_status);
-		}
-		$this->SetDBField($status_field, $new_status);
-
-		return $this->Update();
-	}
-
-	function sendEmailEvents($new_status)
-	{
-		$perm_prefix = $this->Application->getUnitOption($this->Prefix, 'PermItemPrefix');
-		$owner_field = $this->Application->getUnitOption($this->Prefix, 'OwnerField');
-		if (!$owner_field) {
-			$owner_field = 'CreatedById';
-		}
-
-		$event_name = $perm_prefix.'.'.($new_status == STATUS_ACTIVE ? 'APPROVE' : 'DENY');
-		$this->Application->EmailEventUser($event_name, $this->GetDBField($owner_field));
-	}
-
-	/**
-	 * Approves changes made to category item
-	 *
-	 * @return bool
-	 */
-	function ApproveChanges()
-	{
-		$original_id = $this->GetDBField('OrgId');
-
-		if (!($this->usePendingEditing && $original_id)) {
-			// non-pending copy of original link
-			return $this->ChangeStatus(STATUS_ACTIVE);
-		}
-
-		if ($this->raiseEvent('OnBeforeDeleteOriginal', null, Array('original_id' => $original_id))) {
-			// delete original item, because changes made in pending copy (this item) got to be approved in this method
-			$temp_handler =& $this->Application->recallObject($this->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
-			$temp_handler->DeleteItems($this->Prefix, $this->Special, Array($original_id));
-
-			$this->SetDBField('OrgId', 0);
-			return $this->ChangeStatus(STATUS_ACTIVE);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Decline changes made to category item
-	 *
-	 * @return bool
-	 */
-	function DeclineChanges()
-	{
-		$original_id = $this->GetDBField('OrgId');
-
-		if (!($this->usePendingEditing && $original_id)) {
-			// non-pending copy of original link
-			return $this->ChangeStatus(STATUS_DISABLED);
-		}
-
-		// delete this item, because changes made in pending copy (this item) will be declined in this method
-		$temp_handler =& $this->Application->recallObject($this->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
-		$temp_handler->DeleteItems($this->Prefix, $this->Special, Array($this->GetID()));
-
-		// original item is not changed here, because it is already enabled (thrus pending copy is visible to item's owner or admin with permission)
-		return true;
-	}
-
-	function RegisterHit()
-	{
-		$already_viewed = $this->Application->RecallVar($this->getPrefixSpecial().'_already_viewed');
-		$already_viewed = $already_viewed ? unserialize($already_viewed) : Array ();
-
-		$id = $this->GetID();
-		if (!in_array($id, $already_viewed)) {
-			$property_map = $this->Application->getUnitOption($this->Prefix, 'ItemPropertyMappings');
-			if (!$property_map) {
-				return ;
-			}
-			$hits_field = $property_map['ClickField'];
-			$new_hits = $this->GetDBField($hits_field) + 1;
-
-			$sql = 'SELECT MAX('.$hits_field.')
-					FROM '.$this->TableName.'
-					WHERE FLOOR('.$hits_field.') = '.$new_hits;
-			$max_hits = $this->Conn->GetOne($sql);
-			if ($max_hits) {
-				$new_hits = $max_hits + 0.000001;
-			}
-
-			$fields_hash = Array (
-				$hits_field => $new_hits,
-			);
-			$this->Conn->doUpdate($fields_hash, $this->TableName, $this->IDField.' = '.$id);
-
-			array_push($already_viewed, $id);
-			$this->Application->StoreVar($this->getPrefixSpecial().'_already_viewed', serialize($already_viewed));
-		}
-	}
-
-	/**
-	* Returns part of SQL WHERE clause identifing the record, ex. id = 25
-	*
-	* @access public
-	* @param string $method Child class may want to know who called GetKeyClause, Load(), Update(), Delete() send its names as method
-	* @param Array $keys_hash alternative, then item id, keys hash to load item by
-	* @return void
-	* @see kDBItem::Load()
-	* @see kDBItem::Update()
-	* @see kDBItem::Delete()
-	*/
-	function GetKeyClause($method = null, $keys_hash = null)
-	{
-		if ($method == 'load') {
-			// for item with many categories makes primary to load
-			$ci_table = TABLE_PREFIX.'CategoryItems';
-			if ($this->IsTempTable()) {
-				$ci_table = $this->Application->GetTempName($ci_table, 'prefix:'.$this->Prefix);
-			}
-			$keys_hash = Array(
-				$this->IDField => $this->ID,
-				'`'.$ci_table.'`.`PrimaryCat`' => 1,
-			);
-		}
-		return parent::GetKeyClause($method, $keys_hash);
-	}
-
-}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/units/configuration/configuration_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/configuration/configuration_config.php	(.../configuration_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: configuration_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,85 +12,86 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
-					'Prefix'			=>	'conf',
-					'ItemClass'			=>	Array('class'=>'ConfigurationItem','file'=>'configuration.php','build_event'=>'OnItemBuild'),
-					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class'=>'ConfigurationEventHandler','file'=>'configuration_event_handler.php','build_event'=>'OnBuild'),
-					'TagProcessorClass' =>	Array('class'=>'ConfigurationTagProcessor','file'=>'configuration_tag_processor.php','build_event'=>'OnBuild'),
-					'AutoLoad'			=>	true,
-					'Hooks'				=>	Array(),
-					'QueryString'		=>	Array(
-												1	=>	'id',
-												2	=>	'page',
-												3	=>	'event',
-												4	=>	'mode',
-											),
+defined('FULL_PATH') or die('restricted access!');
 
-					'IDField'			=>	'VariableId',
-					'TitleField' 	=>	'VariableName',
+	$config = Array (
+		'Prefix' => 'conf',
+		'ItemClass' => Array ('class' => 'ConfigurationItem', 'file' => 'configuration.php', 'build_event' => 'OnItemBuild'),
+		'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+		'EventHandlerClass' => Array ('class' => 'ConfigurationEventHandler', 'file' => 'configuration_event_handler.php', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array ('class' => 'ConfigurationTagProcessor', 'file' => 'configuration_tag_processor.php', 'build_event' => 'OnBuild'),
 
-					'TitlePresets'		=>	Array(
-						'default'	=>	Array('tag_params' => Array('conf' => Array('per_page' => -1))),
+		'AutoLoad' => true,
 
-						'config_list_general' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
-						'config_list_output' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
-						'config_list_contacts' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
+		'QueryString' => Array (
+			1 => 'id',
+			2 => 'Page',
+			3 => 'event',
+			4 => 'mode',
+		),
 
-						'config_list_categories' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
-						'config_list_users' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
+		'IDField' => 'VariableId',
+		'TitleField' => 'VariableName',
 
-						'section_label' => Array ('prefixes' => Array ('conf_List'), 'format' => "#section_label#"),
-					),
+		'TitlePresets' => Array (
+			'default' => Array ('tag_params' => Array ('conf' => Array ('per_page' => -1))),
 
-					'TableName'			=>	TABLE_PREFIX.'ConfigurationValues',
+			'config_list_general' => Array ('prefixes' => Array ('conf_List'), 'format' => "!la_updating_config!"),
+			'config_list_output' => Array ('prefixes' => Array ('conf_List'), 'format' => "!la_updating_config!"),
+			'config_list_contacts' => Array ('prefixes' => Array ('conf_List'), 'format' => "!la_updating_config!"),
 
-					'ListSQLs'			=>	Array(''	=>	'	SELECT %1$s.* %2$s
-																FROM '.TABLE_PREFIX.'ConfigurationAdmin ca
-																LEFT JOIN %1$s USING(VariableName)'),
+			'config_list_categories' => Array ('prefixes' => Array ('conf_List'), 'format' => "!la_updating_config!"),
+			'config_list_users' => Array ('prefixes' => Array ('conf_List'), 'format' => "!la_updating_config!"),
 
-					'ItemSQLs'			=>	Array(''	=>	'	SELECT %1$s.* %2$s
-																FROM '.TABLE_PREFIX.'ConfigurationAdmin ca
-																LEFT JOIN %1$s USING(VariableName)'),
+			'section_label' => Array ('prefixes' => Array ('conf_List'), 'format' => "#section_label#"),
+		),
 
-					'ListSortings'		=> 	Array(
-													'' => Array(
-														'Sorting' => Array('DisplayOrder' => 'asc', 'GroupDisplayOrder' => 'asc'),
-													)
-											),
+		'TableName' => TABLE_PREFIX . 'ConfigurationValues',
 
-					'CalculatedFields'	=>	Array (
-													''	=>	Array (
-																	'heading'	=>	'ca.heading',
-																	'prompt'	=>	'ca.prompt',
-																	'element_type'	=>	'ca.element_type',
-																	'ValueList'	=>	'ca.ValueList',
-																	'DisplayOrder'	=>	'ca.DisplayOrder',
-																	'GroupDisplayOrder'	=>	'ca.GroupDisplayOrder',
-																	'Install'	=>	'ca.Install',
-															),
-											),
+		'ListSQLs' => Array (
+			'' => '	SELECT %1$s.* %2$s
+					FROM ' . TABLE_PREFIX . 'ConfigurationAdmin ca
+					LEFT JOIN %1$s USING(VariableName)'
+		),
 
-				  	'Fields' 		=>	Array(
-				  								'VariableId'	=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-										        'VariableName'	=>	Array('type' => 'string','not_null' => '1','default' => ''),
-										        'VariableValue' =>	Array('type'=>'string', 'default' => null),
-										        'ModuleOwner'	=>	Array('type'=>'string', 'default'=>'In-Portal'),
-										        'Section'		=>	Array('type'=>'string','not_null' => '1','default'=>''),
-											),
 
-					'VirtualFields'	=> 	Array(
-												'heading'			=>	Array('type' => 'string', 'default' => ''),
-										        'prompt'			=>	Array('type' => 'string', 'default' => ''),
-										        'element_type'		=>	Array('type' => 'string', 'not_null' => '1', 'default' => ''),
-										        'ValueList'			=>	Array('type' => 'string', 'default' => ''),
-										        'DisplayOrder'		=>	Array('type' => 'double', 'not_null' => '1', 'default' => 0),
-										        'GroupDisplayOrder'	=>	Array('type' => 'double', 'not_null' => '1', 'default' => 0),
-										        'Install'			=>	Array('type' => 'int', 'not_null' => '1', 'default' => 1),
-										        'DirectOptions'		=>	Array('type' => 'string', 'default' => ''),
-											),
 
-					'Grids'	=> Array(),
-	);
+		'ListSortings' => Array (
+			'' => Array (
+				'Sorting' => Array ('DisplayOrder' => 'asc', 'GroupDisplayOrder' => 'asc'),
+			)
+		),
 
-?>
\ No newline at end of file
+		'CalculatedFields' => Array (
+			''	=>	Array (
+				'heading' => 'ca.heading',
+				'prompt' => 'ca.prompt',
+				'element_type' => 'ca.element_type',
+				'Validation' => 'ca.Validation',
+				'ValueList' => 'ca.ValueList',
+				'DisplayOrder' => 'ca.DisplayOrder',
+				'GroupDisplayOrder' => 'ca.GroupDisplayOrder',
+				'Install' => 'ca.Install',
+			),
+		),
+
+  		'Fields' => Array (
+			'VariableId'	=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+			'VariableName'	=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+			'VariableValue' =>	Array ('type' => 'string', 'default' => null),
+			'ModuleOwner'	=>	Array ('type' => 'string', 'default' => 'In-Portal'),
+			'Section'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		),
+
+		'VirtualFields' => Array (
+			'heading'			=>	Array ('type' => 'string', 'default' => ''),
+	        'prompt'			=>	Array ('type' => 'string', 'default' => ''),
+	        'element_type'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+	        'Validation'		=>	Array ('type' => 'string', 'default' => ''),
+	        'ValueList'			=>	Array ('type' => 'string', 'default' => ''),
+	        'DisplayOrder'		=>	Array ('type' => 'double', 'not_null' => '1', 'default' => 0),
+	        'GroupDisplayOrder'	=>	Array ('type' => 'double', 'not_null' => '1', 'default' => 0),
+	        'Install'			=>	Array ('type' => 'int', 'not_null' => '1', 'default' => 1),
+	        'DirectOptions'		=>	Array ('type' => 'string', 'default' => ''),
+		),
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/categories/categories_edit_related_searches.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/categories/categories_edit_related_searches.tpl	(.../categories_edit_related_searches.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/categories/categories_edit_related_searches.tpl	(.../categories_edit_related_searches.tpl)	(revision 12657)
@@ -35,7 +35,7 @@
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				//Relations related:
-				a_toolbar.AddButton( new ToolBarButton('new_related_search', '<inp2:m_phrase label="la_ToolTip_New_Keyword" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Keyword" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							std_new_item('c-search', 'categories/related_searches_edit')
 						} ) );
Index: branches/5.1.x/core/units/mailing_lists/mailing_list_eh.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 12127)
+++ branches/5.1.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_eh.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: mailing_list_eh.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class MailingListEventHandler extends kDBEventHandler {
 
 		/**
Index: branches/5.1.x/core/admin_templates/languages/language_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/languages/language_list.tpl	(.../language_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/languages/language_list.tpl	(.../language_list.tpl)	(revision 12657)
@@ -14,7 +14,7 @@
   			}
 
   			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_language', '<inp2:m_phrase label="la_ToolTip_NewLanguage" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewLanguage" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
 						function() {
 							std_precreate_item('lang', 'regional/languages_edit')
 						} ) );
@@ -43,7 +43,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="lang" IdField="LanguageId" grid="LangManagement" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['lang'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
+	Grids['lang'].SetDependantToolbarButtons( new Array('edit','delete','setprimary','export_language') );
 </script>
 
 <inp2:m_if check="m_Recall" var="RefreshTopFrame" value="1">
Index: branches/5.1.x/core/admin_templates/browser/browser_header.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/browser/browser_header.tpl	(.../browser_header.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/browser/browser_header.tpl	(.../browser_header.tpl)	(revision 12657)
@@ -1,15 +1,15 @@
-<inp2:m_DefaultParam body_properties=""/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<inp2:m_DefaultParam body_properties=""/>
 <html>
 <head>
 <title><inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>
 
-<meta http-equiv="content-type" content="text/html; charset=<inp2:lang_GetCharset/>">
-<meta name="keywords" content="...">
-<meta name="description" content="...">
-<meta name="robots" content="all">
-<meta name="copyright" content="Copyright &#174; 2006 Test, Inc">
-<meta name="author" content="Intechnic Inc.">
+<meta http-equiv="content-type" content="text/html; charset=<inp2:lang_GetCharset/>"/>
+<meta name="keywords" content="..."/>
+<meta name="description" content="..."/>
+<meta name="robots" content="all"/>
+<meta name="copyright" content="Copyright &#174; 2006 Test, Inc"/>
+<meta name="author" content="Intechnic Inc."/>
 
 <inp2:m_base_ref/>
 
@@ -19,17 +19,14 @@
 
 <script type="text/javascript" src="js/is.js"></script>
 <script type="text/javascript" src="js/ajax.js"></script>
-<script language="javascript" src="js/application.js"></script>
+<script type="text/javascript" src="js/application.js"></script>
 <script type="text/javascript" src="js/script.js"></script>
-<script type="text/javascript" src="js/in-portal.js"></script>
-<script type="text/javascript" src="js/toolbar.js"></script>
-<script type="text/javascript" src="js/grid.js"></script>
-<script type="text/javascript" src="js/forms.js"></script>
-<script type="text/javascript" src="js/form_controls.js"></script>
-<script type="text/javascript" src="js/calendar.js"></script>
-<script language="javascript">
+
+<script type="text/javascript">
 var t = '<inp2:m_get param="t"/>';
 var popups = '1';
+var $use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>;
+var $modal_windows = <inp2:m_if check="adm_UsePopups" mode="modal">true<inp2:m_else/>false</inp2:m_if>;
 var multiple_windows = '1';
 var main_title = '<inp2:m_GetConfig var="Site_Name" escape="1"/>';
 var tpl_changed = 0;
@@ -45,6 +42,7 @@
 	window.name += '_<inp2:m_get name="m_wid"/>';
 </inp2:m_if>
 
+var $use_toolbarlabels = <inp2:m_if check="adm_UseToolbarLabels">true<inp2:m_else/>false</inp2:m_if>;
 </script>
 </head>
 
@@ -54,4 +52,3 @@
 <inp2:m_if check="m_ParamEquals" name="nobody" value="yes" inverse="inverse">
 	<body <inp2:m_param name="body_properties"/>>
 </inp2:m_if>
-
Index: branches/5.1.x/core/units/selectors/selectors_tag_processor.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/selectors/selectors_tag_processor.php	(.../selectors_tag_processor.php)	(revision 12127)
+++ branches/5.1.x/core/units/selectors/selectors_tag_processor.php	(.../selectors_tag_processor.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: selectors_tag_processor.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: selectors_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,19 +12,20 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-	class SelectorsTagProcessor extends kDBTagProcessor 
-	{
-	
+	defined('FULL_PATH') or die('restricted access!');
+
+	class SelectorsTagProcessor extends kDBTagProcessor {
+
 		function PrintStyle($params)
 		{
 			$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
 			$style_data = $object->GetDBField( $params['field'] );
-			
+
 			$ret = $object->CompileStyleBody( getArrayValue($params,'inline') ? STYLE_INLINE : STYLE_PREVIEW );
-			
+
 			return $ret;
 		}
-		
+
 		/**
 		 * Returns input field name to
 		 * be placed on form (for correct
@@ -40,11 +41,11 @@
 			$subfield = getArrayValue($params,'subfield');
 			if($subfield && $subfield != '$subfield')
 			{
-				$ret .= '['.$subfield.']';	
+				$ret .= '['.$subfield.']';
 			}
 			return $ret;
 		}
-		
+
 		function Field($params)
 		{
 			$subfield = getArrayValue($params,'subfield');
@@ -56,11 +57,11 @@
 			if($subfield && $subfield != '$subfield')
 			{
 				$ret = getArrayValue($ret,$subfield);
-				return $ret !== false ? $ret : '';	
+				return $ret !== false ? $ret : '';
 			}
 			return $ret;
 		}
-		
+
 		function PredefinedOptions($params)
 		{
 			$field = $params['field'];
@@ -69,10 +70,10 @@
 			$value = $object->GetDBField($field);
 			$subfield = getArrayValue($params,'subfield');
 			if($subfield && $subfield != '$subfield') $value = $value[$subfield];
-			
+
 			$value_field = getArrayValue($params,'value_field');
 			if(!$value_field) $value_field = $field;
-			
+
 			$options = $object->GetFieldOptions($value_field);
 
 			$block_params['name'] = $params['block'];
@@ -95,7 +96,5 @@
 
 			return $o;
 		}
-		
-	}
 
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/general/libchart/classes/view/chart/LineChart.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/chart/LineChart.php	(.../LineChart.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/chart/LineChart.php	(.../LineChart.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * Line chart.
 	 *
@@ -196,5 +198,4 @@
 
 			$this->plot->render($fileName);
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/general/cat_dblist.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/general/cat_dblist.php	(revision 12127)
+++ branches/5.1.x/core/units/general/cat_dblist.php	(revision 0)
@@ -1,37 +0,0 @@
-<?php
-/**
-* @version	$Id: cat_dblist.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-class kCatDBList extends kDBList {
-	
-	/**
-	 * Select items from current category or from all categories
-	 *
-	 * @var bool
-	 */
-	var $Scope = true;
-	
-	/*function GetWhereClause($for_counting=false,$system_filters_only=false)
-	{
-		switch ($this->Special)
-		{
-			case 'showall':
-				$this->clearFilters(false,true,false,false); 
-				break;
-		}
-		return parent::GetWhereClause($for_counting,$system_filters_only);
-	}*/
-	
-}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_review.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/configuration/configuration_tag_processor.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 12127)
+++ branches/5.1.x/core/units/configuration/configuration_tag_processor.php	(.../configuration_tag_processor.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_tag_processor.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: configuration_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class ConfigurationTagProcessor extends kDBTagProcessor {
 
 
@@ -69,7 +71,7 @@
 
 			// set values from submit if any
 			if ($field_values) {
-				$list->SetDBField('VariableValue', $field_values[$list->GetDBField('VariableName')]['VariableValue']);
+				$list->SetDBField('VariableValue', $field_values[$list->GetID()]['VariableValue']);
 			}
 			$list->SetDBField('DirectOptions', '');
 
@@ -135,22 +137,27 @@
 		return $this->Application->ConfigValue($params['name']);
 	}
 
+	function IsRequired($params)
+	{
+		$object =& $this->getObject($params);;
+		/* @var $object kDBList */
+
+		$field_options = $object->GetDBField('Validation');
+		$field_options = $field_options ? unserialize($field_options) : Array ();
+
+		return array_key_exists('required', $field_options) && $field_options['required'];
+	}
+
 	function Error($params)
 	{
-		$object =& $this->Application->recallObject( $this->getPrefixSpecial() );
+		$object =& $this->getObject($params);
+		/* @var $object kDBList */
+
 		$field = $object->GetDBField($params['id_field']);
 
-		$errors = $this->Application->GetVar('errormsgs');
-		$errors = $errors[$this->getPrefixSpecial()];
+		$errors = $this->Application->GetVar('errors_' . $this->getPrefixSpecial(), Array ());
 
-		if (isset($errors[$field])) {
-			$msg = $this->Application->Phrase($errors[$field]);
-		}
-		else {
-			$msg = '';
-		}
-
-		return $msg;
+		return array_key_exists($field, $errors) ? $errors[$field] : '';
 	}
 
 	/**
@@ -239,6 +246,4 @@
 		return is_writable($this->ConfigValue($params));
 	}
 
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
Index: branches/5.1.x/core/units/user_profile/user_profile_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/user_profile/user_profile_config.php	(.../user_profile_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/user_profile/user_profile_config.php	(.../user_profile_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_profile_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: user_profile_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'user-profile',
 		'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -44,6 +46,4 @@
 		    'VariableName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
 		    'VariableValue' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 	    ),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_language_primary.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_theme_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_summary_logs.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/browser/browser_footer.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/browser/browser_footer.tpl	(.../browser_footer.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/browser/browser_footer.tpl	(.../browser_footer.tpl)	(revision 12657)
@@ -14,7 +14,7 @@
 
 	</script>
 <inp2:m_else/>
-	<inp2:m_ifnot check="m_Get" name="template" equals_to="head|tree">
+	<inp2:m_ifnot check="m_Get" name="t" equals_to="head|tree">
 	<br /><br />
 	</inp2:m_ifnot>
 </inp2:m_if>
Index: branches/5.1.x/core/kernel/utility/formatters/password_formatter.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/formatters/password_formatter.php	(.../password_formatter.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: password_formatter.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: password_formatter.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -17,19 +17,17 @@
 
 	function PrepareOptions($field_name, &$field_options, &$object)
 	{
-		if( isset( $field_options['verify_field'] ) )
-		{
-			$add_fields = Array();
-			$options = Array('master_field' => $field_name, 'formatter' => 'kPasswordFormatter');
-			if (isset($field_options['encryption_method'])) {
-				$options['encryption_method'] = $field_options['encryption_method'];
+		if ( isset( $field_options['verify_field'] ) ) {
+			$add_fields = Array ();
+			$options = Array ('master_field' => $field_name, 'formatter' => 'kPasswordFormatter');
+
+			$copy_options = Array ('encryption_method', 'salt', 'required', 'skip_empty');
+			foreach ($copy_options as $copy_option) {
+				if (array_key_exists($copy_option, $field_options)) {
+					$options[$copy_option] = $field_options[$copy_option];
+				}
 			}
-			if (isset($field_options['salt'])) {
-				$options['salt'] = $field_options['salt'];
-			}
-			if (isset($field_options['required'])) {
-				$options['required'] =  $field_options['required'];
-			}
+
 			$add_fields[ $field_options['verify_field'] ] = $options;
 
 			$add_fields[$field_name.'_plain'] = Array('type'=>'string', 'error_field'=>$field_name);
@@ -57,63 +55,68 @@
 	{
 		$options = $object->GetFieldOptions($field_name);
 
-		$fields = Array('master_field','verify_field');
-		$fields_set = true;
 		$flip_count = 0;
-		while($flip_count < 2)
-		{
-			if( getArrayValue($options,$fields[0]) )
-			{
+		$fields_set = true;
+		$fields = Array ('master_field', 'verify_field');
+
+		// 1. collect values from both Password and VerifyPassword fields
+		while ($flip_count < 2) {
+			if ( getArrayValue($options, $fields[0]) ) {
 				$object->SetDBField($field_name.'_plain', $value);
-				if( !getArrayValue($object->Fields[ $options[ $fields[0] ] ], $fields[1].'_set') )
-				{
+
+				if ( !getArrayValue($object->Fields[ $options[ $fields[0] ] ], $fields[1].'_set') ) {
 					$object->Fields[ $options[ $fields[0] ] ][$fields[1].'_set'] = true;
 				}
 
 				$password_field = $options[ $fields[0] ];
 				$verify_field = $field_name;
 			}
+
 			$fields = array_reverse($fields);
 			$flip_count++;
 		}
 
 		$salt = isset($object->Fields[$password_field]['salt']) ? $object->Fields[$password_field]['salt'] : '';
-		if( getArrayValue($object->Fields[$password_field], 'verify_field_set') && getArrayValue($object->Fields[$verify_field], 'master_field_set') )
-		{
-			$new_password = $object->GetDBField($password_field.'_plain');
-			$verify_password = $object->GetDBField($verify_field.'_plain');
 
-			if($new_password == '' && $verify_password == '')
-			{
-				if( $object->GetDBField($password_field) != $this->EncryptPassword('', $salt) )
-				{
-					if ($options['encryption_method'] == 'plain') return $value;
+		if (getArrayValue($object->Fields[$password_field], 'verify_field_set') && getArrayValue($object->Fields[$verify_field], 'master_field_set')) {
+			$new_password = $object->GetDBField($password_field . '_plain');
+			$verify_password = $object->GetDBField($verify_field . '_plain');
+
+			if ($new_password == '' && $verify_password == '') {
+				// both passwords are empty -> keep old password
+				if ($object->GetDBField($password_field) != $this->EncryptPassword('', $salt)) {
+					if ($options['encryption_method'] == 'plain') {
+						return $value;
+					}
+
 					return $this->EncryptPassword($value);
 				}
-				else
-				{
-					$object->Fields[$password_field.'_plain']['required'] = true;
-					$object->Fields[$verify_field.'_plain']['required'] = true;
-					return null;
+				else {
+					return $value;
 				}
 			}
 
-			$min_length = $this->Application->ConfigValue('Min_Password');
-			if (mb_strlen($new_password) >= $min_length) {
-				if ($new_password != $verify_password) {
-					$object->SetError($password_field, 'passwords_do_not_match', 'lu_passwords_do_not_match');
-					$object->SetError($verify_field, 'passwords_do_not_match', 'lu_passwords_do_not_match');
-				}
+			if ($new_password != $verify_password) {
+				// passwords don't match (no matter what is their length)
+				$object->SetError($verify_field, 'passwords_do_not_match', 'lu_passwords_do_not_match');
 			}
-			else {
-				$error_msg = '+'.sprintf($this->Application->Phrase('lu_passwords_too_short'), $min_length); // + -> not phrase
+
+			$min_length = $this->Application->ConfigValue('Min_Password'); // for error message too
+
+			if (mb_strlen($new_password) < $min_length) {
+				$error_msg = '+' . sprintf($this->Application->Phrase('lu_passwords_too_short'), $min_length); // + -> not phrase
 				$object->SetError($password_field, 'passwords_min_length', $error_msg);
-				$object->SetError($verify_field, 'passwords_min_length', $error_msg);
 			}
 		}
-		if($value == '') return $object->GetDBField($field_name);
 
-		if ($options['encryption_method'] == 'plain') return $value;
+		if ($value == '') {
+			return $object->GetDBField($field_name);
+		}
+
+		if ($options['encryption_method'] == 'plain') {
+			return $value;
+		}
+
 		return $this->EncryptPassword($value, $salt);
 	}
 
Index: branches/5.1.x/core/units/help/help_config.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/help/help_config.php	(revision 12127)
+++ branches/5.1.x/core/units/help/help_config.php	(revision 0)
@@ -1,28 +0,0 @@
-<?php
-/**
-* @version	$Id: help_config.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-$config	=	Array(
-					'Prefix'			=>	'h',
-					'EventHandlerClass'	=>	Array('class'=>'HelpEventHandler','file'=>'help_event_handler.php','build_event'=>'OnBuild'),
-					'TagProcessorClass' =>	Array('class'=>'HelpTagProcessor','file'=>'help_tag_processor.php','build_event'=>'OnBuild'),
-					'QueryString'		=>	Array(
-												1	=>	'prefix',
-												2	=>	'icon',
-												3	=>	'module',
-												4	=>	'title_preset',
-												5	=>	'event',
-											),
-					);
-					
-?>
\ No newline at end of file
Index: branches/5.1.x/core/units/help/help_tag_processor.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/help/help_tag_processor.php	(revision 12127)
+++ branches/5.1.x/core/units/help/help_tag_processor.php	(revision 0)
@@ -1,119 +0,0 @@
-<?php
-/**
-* @version	$Id: help_tag_processor.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	class HelpTagProcessor extends kDBTagProcessor
-	{
-
-		function SectionTitle($params)
-		{
-			$rets = explode('.', $this->Application->GetVar('h_prefix') );
-			$this->Prefix = $rets[0];
-			$this->Special = isset($rets[1]) ? $rets[1] : '';
-			//$this->Prefix = $this->Application->GetVar('h_prefix');
-
-			$title_preset_name = replaceModuleSection($this->Application->GetVar('h_title_preset'));
-			$this->Application->SetVar('h_title_preset', $title_preset_name);
-			$title_presets = $this->Application->getUnitOption($this->Prefix,'TitlePresets');
-
-			$format = $title_presets[$title_preset_name]['format'];
-			$format = preg_replace('/[ ]*( ([\'"]{1}) | ([\(]{1}) ) \#.*\# (?(2) \1 | \) )[ ]*/Ux', ' ', $format);
-			$title_presets[$title_preset_name]['format'] = $format;
-			$this->Application->setUnitOption($this->Prefix,'TitlePresets',$title_presets);
-
-			$params['title_preset'] = $title_preset_name;
-			return parent::SectionTitle($params);
-		}
-
-		function getModule()
-		{
-			$module = $this->Application->GetVar('h_module');
-			if (!$module) {
-				$module = $this->Application->RecallVar('module');
-			}
-			return $module;
-		}
-
-		function ShowHelp($params)
-		{
-			$module = $this->getModule();
-
-			$module = explode(':', $module);
-			$module = $module[0];
-
-			$title_preset = $this->Application->GetVar('h_title_preset');
-
-			$module_path = $this->Application->findModule('Name', $module, 'Path');
-			$help_file = FULL_PATH.'/'.$module_path.'module_help/'.$title_preset.'.txt';
-
-			if ($this->Application->isDebugMode() && constOn('DBG_EDIT_HELP')) {
-				global $debugger;
-				$ret = 'Help file: <b>'.$debugger->getLocalFile($help_file).'</b><hr>';
-			}
-			else {
-				$ret = '';
-			}
-
-			$help_data = file_exists($help_file) ? file_get_contents($help_file) : false;
-
-			if( $this->Application->isDebugMode() && constOn('DBG_HELP') )
-			{
-				$this->Application->Factory->includeClassFile('FCKeditor');
-				$oFCKeditor = new FCKeditor('HelpContent');
-
-				$oFCKeditor->BasePath	= $this->Application->BaseURL('/admin/editor/cmseditor');
-				$oFCKeditor->Width		= '100%';
-				$oFCKeditor->Height		= '300';
-				$oFCKeditor->ToolbarSet	= 'Advanced';
-				$oFCKeditor->Value		= $help_data;
-
-				$oFCKeditor->Config = Array(
-					'UserFilesPath' =>	(defined('WRITEABLE') ? WRITEABLE : FULL_PATH.'/kernel') . '/user_files',
-					'ProjectPath' 	=> 	$this->Application->ConfigValue('Site_Path'),
-					'CustomConfigurationsPath' => rtrim( $this->Application->BaseURL('/admin/editor/inp_fckconfig.js'), '/'),
-				);
-
-  				$ret .= $oFCKeditor->CreateHtml();
-			}
-			else
-			{
-				$ret .= $help_data ? $help_data : $this->Application->Phrase('la_section_help_file_missing');
-			}
-
-			return $ret;
-		}
-
-		function GetIcon($params)
-		{
-			$icon_var = getArrayValue($params,'var_name');
-			$icon = replaceModuleSection($this->Application->GetVar($icon_var));
-
-			if(!$icon) $icon = getArrayValue($params,'default_icon');
-			return $icon;
-		}
-
-		/**
-		 * Returns templates path for module, which is gathered from prefix module
-		 *
-		 * @param Array $params
-		 * @return string
-		 * @author Alex
-		 */
-		function ModulePath($params)
-		{
-			$module_folder = trim( $this->Application->findModule('Name', $this->getModule(), 'Path'), '/');
-			return '../../'.$module_folder.'/admin_templates/';
-		}
-	}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/units/help/help_event_handler.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/help/help_event_handler.php	(revision 12127)
+++ branches/5.1.x/core/units/help/help_event_handler.php	(revision 0)
@@ -1,42 +0,0 @@
-<?php
-/**
-* @version	$Id: help_event_handler.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	class HelpEventHandler extends kDBEventHandler
-	{
-
-		/**
-		 * Saves help file or created new one
-		 *
-		 * @param kEvent $event
-		 */
-		function OnSaveHelp(&$event)
-		{
-			$new_content = $this->Application->GetVar('HelpContent');
-
-			$module = $this->Application->GetVar('h_module');
-			$title_preset = $this->Application->GetVar('h_title_preset');
-
-			$sql = 'SELECT Path FROM '.TABLE_PREFIX.'Modules WHERE LOWER(Name)='.$this->Conn->qstr( mb_strtolower($module) );
-			$module_path = $this->Conn->GetOne($sql);
-
-			$help_file = FULL_PATH.'/'.$module_path.'module_help/'.$title_preset.'.txt';
-			$help_data = $this->Application->GetVar('HelpContent');
-
-			$fp = fopen($help_file,'w');
-			fwrite($fp,$help_data);
-			fclose($fp);
-		}
-	}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: email_events_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class EmailEventsEventsHandler extends kDBEventHandler
 	{
 
@@ -87,9 +89,11 @@
 
 			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$sql = 'UPDATE '.$table_name.'
-					SET Enabled = 2
+					SET FrontEndOnly = 1
 					WHERE EventId IN ('.$ids.')';
 			$this->Conn->Query($sql);
+
+			$this->clearSelectedIDs($event);
 		}
 
 		/**
@@ -99,6 +103,11 @@
 		 */
 		function OnSelectUser(&$event)
 		{
+			if ($event->Special != 'module') {
+				parent::OnSelectUser($event);
+				return ;
+			}
+
 			$items_info = $this->Application->GetVar('u');
 			if ($items_info) {
 				$user_id = array_shift( array_keys($items_info) );
@@ -152,21 +161,26 @@
 				return false;
 			}
 
-			$enabled = $email_event->GetDBField('Enabled');
-			if ($enabled == EVENT_STATUS_DISABLED) {
+			if ($email_event->GetDBField('Enabled') == STATUS_DISABLED) {
 				return false;
 			}
-			if ($enabled == EVENT_STATUS_FRONTEND && $this->Application->IsAdmin()) {
+
+			if ($email_event->GetDBField('FrontEndOnly') && $this->Application->IsAdmin()) {
 				return false;
 			}
 
 			// initial values
 			$to_user_id = $event->getEventParam('EmailEventToUserId');
+			if ( !is_numeric($to_user_id) ) {
+				$to_user_id = -1; // when not specified, then send to "root"
+            }
 			$from_user_id = $email_event->GetDBField('FromUserId');
 
 			if ($email_event->GetDBField('Type') == EVENT_TYPE_ADMIN) {
 				// For type "Admin" recipient is a user from field FromUserId which means From/To user in Email events list
-				$to_user_id = $from_user_id;
+				if ($to_user_id == -1) {
+					$to_user_id = $from_user_id;
+				}
 				$from_user_id = -1;
 			}
 
@@ -190,7 +204,7 @@
 			/* @var $user UsersItem */
 
 			$email = $name = '';
-			$result = $user_id > 0 ? $user->Load($user_id) : $user->Clear();
+			$result = $user_id > 0 ? $user->Load( (int)$user_id ) : $user->Clear();
 			if ($user->IsLoaded()) {
 				 $email = $user->GetDBField('Email');
 				 $name = trim($user->GetDBField('FirstName').' '.$user->GetDBField('LastName'));
@@ -299,23 +313,11 @@
 			$this->Application->InitParser();
 			$parser_params = $this->Application->Parser->Params; // backup parser params
 
-			// ==== for TemplateParser class only: begin ====
-//			$parser_pattern = $this->Application->Parser->Pattern;
-//			$parser_values = $this->Application->Parser->Values;
-//			$this->Application->Parser->Pattern = Array(); // fixes bug in TemplateParser::SortParams
-//			$this->Application->Parser->Values = Array(); // fixes bug in TemplateParser::SortParams
-			// ==== for TemplateParser class only: end ====
-
 			$this->Application->Parser->SetParams( array_merge_recursive2($parser_params, $direct_params) );
 
 			$message = implode('&|&', explode("\n\n", $message, 2)); // preserves double \n in case when tag is located in subject field
 			$message = $this->Application->Parser->Parse($message, 'email_template', 0);
 
-			// ==== for TemplateParser class only: begin ====
-//			$this->Application->Parser->Pattern = $parser_pattern;
-//			$this->Application->Parser->Values = $parser_values;
-			// ==== for TemplateParser class only: end ====
-
 			$this->Application->Parser->SetParams($parser_params); // restore parser params
 
 			// 2. replace line endings, that are send with data submitted via request
@@ -386,6 +388,11 @@
 			$message_subject = isset($message_headers['Subject']) ? $message_headers['Subject'] : 'Mail message';
 			$esender->SetSubject($message_subject);
 
+			if ($this->Application->isDebugMode()) {
+				// set special header with event name, so it will be easier to determite what's actually was received
+				$message_headers['X-Event-Name'] = $email_event_name . ' - ' . ($event->getEventParam('EmailEventType') == 1 ? 'ADMIN' : 'USER');
+			}
+
 			foreach ($message_headers as $header_name => $header_value) {
 				$esender->SetEncodedHeader($header_name, $header_value);
 			}
@@ -419,10 +426,11 @@
 
 		function _getSendLanguage($send_params)
 		{
-			if (!is_array($send_params) && $this->Application->isDebugMode()) {
-				$this->Application->Debugger->appendTrace();
+			if ($send_params && array_key_exists('language_id', $send_params)) {
+				return $send_params['language_id'];
 			}
-			return array_key_exists('language_id', $send_params) ? $send_params['language_id'] : $this->Application->GetVar('m_lang');
+
+			return $this->Application->GetVar('m_lang');
 		}
 
 		function _changeLanguage($language_id = null)
@@ -511,5 +519,4 @@
 				echo ($emails_sent / $total_emails) * 100;
 			}
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 12657)
@@ -15,7 +15,7 @@
 	  			}
 
 	  			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_user', '<inp2:m_phrase label="la_ToolTip_NewUser" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewUser" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[u.regular]', 1);
 							std_precreate_item('u.regular', 'users/users_edit')
Index: branches/5.1.x/core/admin_templates/js/uploader/upload_manager.js
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 12657)
@@ -65,7 +65,15 @@
 	}
 }
 
-UploadsManager.iterate = function($method) {
+UploadsManager.iterate = function($method, $timeout) {
+	var $me = this;
+
+	if (isset($timeout)) {
+		// make delayed iteration (helps with direct innerHTML assignments in IE)
+		setTimeout(function() { $me.iterate($method); }, $timeout);
+		return ;
+	}
+
 	for (var i in this._Uploaders) {
 		var args = Array.prototype.slice.call(arguments); // convert to array
 		args.splice(0, 1); // remove method name
Index: branches/5.1.x/core/admin_templates/incs/sections_list.css
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/incs/sections_list.css	(.../sections_list.css)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/incs/sections_list.css	(.../sections_list.css)	(revision 12657)
@@ -19,7 +19,7 @@
 	font-weight: bold;
 	font-size: 12px;
 	color: #ffffff;
-	background: url(../img/summary/overviewbox_header.gif) top left no-repeat;
+	background: url('../img/summary/overviewbox_header.gif') top left no-repeat;
 }
 
 .overviewbox_body {
@@ -56,13 +56,13 @@
 	font-weight: bold;
 	font-size: 12px;
 	color: #000000;
-	background: url(../img/summary/searchbox_header.gif) top left no-repeat;
+	background: url('../img/summary/searchbox_header.gif') top left no-repeat;
 }
 
 .searchbox_body {
 	border: 1px solid #666767;
 	height: 65px;
-	background: url(../img/summary/searchbox_bg.gif) top left;
+	background: url('../img/summary/searchbox_bg.gif') top left;
 }
 
 .search {
@@ -93,12 +93,12 @@
 	font-weight: bold;
 	font-size: 12px;
 	color: #000000;
-	background: url(../img/summary/usersbox_header.gif) top left no-repeat;
+	background: url('../img/summary/usersbox_header.gif') top left no-repeat;
 }
 
 .usersbox_body {
 	border: 1px solid #666767;
-	background: url(../img/summary/usersbox_bg.gif) top left;
+	background: url('../img/summary/usersbox_bg.gif') top left;
 }
 
 .lTDi {
Index: branches/5.1.x/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 12657)
@@ -241,10 +241,12 @@
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
-						<td>Tree Color (TreeColor)</td>
+						<td>Tree Item Color (TreeColor)</td>
+						<td>Tree Item Hover Color (TreeHoverColor)</td>
+						<td>Tree Highlighted Item Color (TreeHighColor)</td>
+						<td>Tree Highlighted Item Hover Color (TreeHighHoverColor)</td>
+						<td>Tree Highlighted Item Background Color (TreeHighBgColor)</td>
 						<td>Tree Background Color (TreeBgColor)</td>
-						<td>Tree Highlighted Color (TreeHighColor)</td>
-						<td>Tree Highlighted Background Color (TreeHighBgColor)</td>
 					</tr>
 					<tr>
 						<td>
@@ -254,8 +256,8 @@
 						</td>
 						<td>
 							<input style="width: 80px" type="text"
-								name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
-								value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
+								name="<inp2:skin_InputName field="Options"/>[TreeHoverColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeHoverColor.Value"/>">
 						</td>
 						<td>
 							<input style="width: 80px" type="text"
@@ -264,9 +266,19 @@
 						</td>
 						<td>
 							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeHighHoverColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeHighHoverColor.Value"/>">
+						</td>
+						<td>
+							<input style="width: 80px" type="text"
 								name="<inp2:skin_InputName field="Options"/>[TreeHighBgColor][Value]"
 								value="<inp2:skin_Field name="Options" format="TreeHighBgColor.Value"/>">
 						</td>
+						<td>
+							<input style="width: 80px" type="text"
+								name="<inp2:skin_InputName field="Options"/>[TreeBgColor][Value]"
+								value="<inp2:skin_Field name="Options" format="TreeBgColor.Value"/>">
+						</td>
 					</tr>
 				</table>
 			</td>
Index: branches/5.1.x/core/admin_templates/incs/style_template.css
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/incs/style_template.css	(.../style_template.css)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/incs/style_template.css	(.../style_template.css)	(revision 12657)
@@ -78,15 +78,15 @@
 
 /* Head frame */
 table.head-table {
-	background: url(@@base_url@@/core/admin_templates/img/top_frame/right_background.jpg) top right @@HeadBgColor@@ no-repeat;
+	background: url('@@base_url@@/core/admin_templates/img/top_frame/right_background.png') top right @@HeadBgColor@@ no-repeat;
 }
 
-.head-table tr td {
+.head-table tr td, .head-table tr td a {
 	color: @@HeadColor@@
 }
 
 div#extra_toolbar td.button-active {
-	background: url(@@base_url@@/core/admin_templates/img/top_frame/toolbar_button_background.gif) bottom left repeat-x;
+	background: url('@@base_url@@/core/admin_templates/img/top_frame/toolbar_button_background.gif') bottom left repeat-x;
 	height: 22px;
 }
 
@@ -97,7 +97,7 @@
 
 td.kx-block-header, .head-table tr td.kx-block-header{
 	color: @@HeadBarColor@@;
-	background: url(@@base_url@@/core/admin_templates/img/top_frame/toolbar_background.gif) repeat-x top left;
+	background: url('@@base_url@@/core/admin_templates/img/top_frame/toolbar_background.gif') repeat-x top left;
 	/*background-color: @@HeadBarBgColor@@;*/
 	padding-left: 7px;
 	padding-right: 7px;
@@ -129,7 +129,7 @@
 	font-size: 12px;
 	font-weight: normal;
 	color: #000000;
-	background: url(@@base_url@@/core/admin_templates/img/button_back.gif) #f9eeae repeat-x;
+	background: url('@@base_url@@/core/admin_templates/img/button_back.gif') #f9eeae repeat-x;
 	text-decoration: none;
 }
 
@@ -138,7 +138,7 @@
 	font-size: 12px;
 	font-weight: normal;
 	color: #676767;
-	background: url(@@base_url@@/core/admin_templates/img/button_back_disabled.gif) #f9eeae repeat-x;
+	background: url('@@base_url@@/core/admin_templates/img/button_back_disabled.gif') #f9eeae repeat-x;
 	text-decoration: none;
 }
 
@@ -178,11 +178,11 @@
 }
 
 a.scroll-left {
-	background: transparent url(@@base_url@@/core/admin_templates/img/tabs/left.png) no-repeat scroll 0 0;
+	background: transparent url('@@base_url@@/core/admin_templates/img/tabs/left.png') no-repeat scroll 0 0;
 }
 
 a.scroll-right {
-	background: transparent url(@@base_url@@/core/admin_templates/img/tabs/right.png) no-repeat scroll 0 0;
+	background: transparent url('@@base_url@@/core/admin_templates/img/tabs/right.png') no-repeat scroll 0 0;
 }
 
 a.disabled {
@@ -193,6 +193,19 @@
 	background-position: 0 -18px;
 }
 
+td.scroll-right-container {
+	width: 20px;
+}
+
+td.scroll-right-container.disabled, td.scroll-right-container.disabled * {
+	width: 0px;
+	margin: 0px;
+}
+
+td.scroll-right-container.disabled br {
+	display: none;
+}
+
 /* Toolbar */
 
 .toolbar {
@@ -424,22 +437,22 @@
 }
 
 .label-cell {
-	background: #DEE7F6 url(@@base_url@@/core/admin_templates/img/bgr_input_name_line.gif) no-repeat right bottom;
+	background: #DEE7F6 url('@@base_url@@/core/admin_templates/img/bgr_input_name_line.gif') no-repeat right bottom;
   font: 12px arial, sans-serif;
   padding: 4px 20px;
-  width: 150px;
+  width: 160px;
 }
 
 .control-mid {
 	width: 13px;
 	border-left: 1px solid #7A95C2;
-	background: #fff url(@@base_url@@/core/admin_templates/img/bgr_mid.gif) repeat-x left bottom;
+	background: #fff url('@@base_url@@/core/admin_templates/img/bgr_mid.gif') repeat-x left bottom;
 }
 
 .control-cell {
 	font: 11px arial, sans-serif;
 	padding: 4px 10px 5px 5px;
-	background: #fff url(@@base_url@@/core/admin_templates/img/bgr_input_line.gif) no-repeat left bottom;
+	background: #fff url('@@base_url@@/core/admin_templates/img/bgr_input_line.gif') no-repeat left bottom;
 	width: auto;
 	vertical-align: middle;
 }
@@ -528,14 +541,14 @@
 	width: 100%;
 	border: 1px solid black;
 	height: 20px;
-	background: #fff url(@@base_url@@/core/admin_templates/img/progress_left.gif);
+	background: #fff url('@@base_url@@/core/admin_templates/img/progress_left.gif');
 }
 
 .uploader-done {
 	width: 0%;
 	background-color: green;
 	height: 20px;
-	background: #4A92CE url(@@base_url@@/core/admin_templates/img/progress_done.gif);
+	background: #4A92CE url('@@base_url@@/core/admin_templates/img/progress_done.gif');
 }
 
 
@@ -635,15 +648,15 @@
 	padding: 2px;
 }
 
+.tree tr td a:hover {
+	color: @@TreeHoverColor@@;
+}
+
 .tree tr.highlighted td a {
-	background-color: @@TreeHighBgColor@@;
 	color: @@TreeHighColor@@;
+	background-color: @@TreeHighBgColor@@;
 }
 
 .tree tr.highlighted td a:hover {
-	color: #fff;
-}
-
-.tree tr td a:hover {
-	color: #000000;
+	color: @@TreeHighHoverColor@@;
 }
\ No newline at end of file
Index: branches/5.1.x/core/install/prerequisites.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/install/prerequisites.php	(.../prerequisites.php)	(revision 12127)
+++ branches/5.1.x/core/install/prerequisites.php	(.../prerequisites.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: prerequisites.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: prerequisites.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -11,6 +11,9 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
+
+	defined('FULL_PATH') or die('restricted access!');
+
 	$prerequisite_class = 'InPortalPrerequisites';
 
 	/**
@@ -67,6 +70,4 @@
 
 			return $errors;
 		}
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_cat_attn.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/users/users_item.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/users/users_item.php	(.../users_item.php)	(revision 12127)
+++ branches/5.1.x/core/units/users/users_item.php	(.../users_item.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_item.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: users_item.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -11,6 +11,9 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
+
+	defined('FULL_PATH') or die('restricted access!');
+
 	class UsersItem extends kDBItem {
 
 		/**
@@ -48,22 +51,16 @@
 
 		function SendEmailEvents()
 		{
-			switch( $this->GetDBField('Status') )
-			{
-				case 1:
-					if ($this->Application->ConfigValue('User_Password_Auto')) {
-						$this->Application->EmailEventAdmin('USER.VALIDATE', $this->GetID() );
-						$this->Application->EmailEventUser('USER.VALIDATE', $this->GetID() );
-					}
-					else {
-						$this->Application->EmailEventAdmin('USER.ADD', $this->GetID() );
-						$this->Application->EmailEventUser('USER.ADD', $this->GetID() );
-					}
+			switch ($this->GetDBField('Status')) {
+				case STATUS_ACTIVE:
+					$event_name = $this->Application->ConfigValue('User_Password_Auto') ? 'USER.VALIDATE' : 'USER.ADD';
+					$this->Application->EmailEventAdmin($event_name);
+					$this->Application->EmailEventUser($event_name, $this->GetID());
 					break;
 
-				case 2:
-					$this->Application->EmailEventAdmin('USER.ADD.PENDING', $this->GetID() );
-					$this->Application->EmailEventUser('USER.ADD.PENDING', $this->GetID() );
+				case STATUS_PENDING:
+					$this->Application->EmailEventAdmin('USER.ADD.PENDING');
+					$this->Application->EmailEventUser('USER.ADD.PENDING', $this->GetID());
 					break;
 			}
 		}
@@ -136,6 +133,4 @@
 			$this->SetDBField('LastName', $last_name);
 		}
 
-
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_settings_search.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_site.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_conf_themes.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_users.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_visits.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/languages/languages_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: languages_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'lang',
 					'ItemClass'			=>	Array('class'=>'LanguagesItem','file'=>'languages_item.php','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
@@ -84,7 +86,10 @@
 																		'new_titlefield'		=> Array('lang'=>''),
 																),
 
-												'languages_list'			=>	Array(	'prefixes'	=>	Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks!"),
+												'languages_list'			=>	Array(
+													'prefixes'	=>	Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks!",
+													'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'export', 'import', 'setprimary', 'refresh', 'view', 'dbl-click'),
+												),
 
 												'languages_edit_general'	=>	Array(	'prefixes'	=> Array('lang'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_General!"),
 
@@ -203,7 +208,7 @@
 											'not_null' => 1, 'required' => 1, 'default' => ''
 										),
 
-										'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
+										'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Active'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
 										'PrimaryLang' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
 										'AdminInterfaceLang' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
     									'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -232,19 +237,34 @@
 
 					'Grids'	=> Array(
 						'Default' => Array (
-							'Icons' => Array ('default' => 'icon16_custom.gif', '0_0' => 'icon16_language_disabled.gif', '1_0' => 'icon16_language.gif', '0_1' => 'icon16_language_disabled.gif', '1_1' => 'icon16_language_primary.gif'),
+							'Icons' => Array (
+								'default' => 'icon16_item.png',
+								'0_0' => 'icon16_disabled.png',
+								'0_1' => 'icon16_disabled.png',
+								'1_0' => 'icon16_item.png',
+								'1_1' => 'icon16_primary.png',
+							),
 							'Fields' => Array(
-								'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-								'PackName' => Array ('title' => 'la_col_PackName', 'filter_block' => 'grid_options_filter'),
-								'LocalName' => Array ('title' => 'la_col_LocalName', 'filter_block' => 'grid_options_filter'),
-								'Enabled' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
-								'PrimaryLang' => Array ('title' => 'la_col_IsPrimary', 'filter_block' => 'grid_options_filter'),
-								'AdminInterfaceLang' => Array ('title' => 'la_col_AdminInterfaceLang', 'filter_block' => 'grid_options_filter'),
+								'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+								'PackName' => Array ('title' => 'la_col_PackName', 'filter_block' => 'grid_options_filter', 'width' => 150, ),//
+								'PrimaryLang' => Array ('title' => 'la_col_IsPrimaryLanguage', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+								'AdminInterfaceLang' => Array ('title' => 'la_col_AdminInterfaceLang', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+								'Charset' => Array ('title' => 'la_col_Charset', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_like_filter', 'width' => 60, ),
+								'Enabled' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 60, ),
+
+
 							),
 						),
 
 						/*'LangManagement' => Array (
-							'Icons' => Array ('default' => 'icon16_custom.gif', '0_0' => 'icon16_language_disabled.gif', '1_0' => 'icon16_language.gif', '0_1' => 'icon16_language_disabled.gif', '1_1' => 'icon16_language_primary.gif'),
+							'Icons' => Array (
+								'default' => 'icon16_item.png',
+								'0_0' => 'icon16_disabled.png',
+								'0_1' => 'icon16_disabled.png',
+								'1_0' => 'icon16_item.png',
+								'1_1' => 'icon16_primary.png',
+							),
 							'Fields' => Array (
 								'LanguageId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60),
 								'PackName' => Array ('title' => 'la_col_Language', 'filter_block' => 'grid_options_filter', 'width' => 120),
@@ -253,6 +273,4 @@
 							),
 						),*/
 					),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_clear_all.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_ship_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/reviews/reviews_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/reviews/reviews_config.php	(.../reviews_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reviews_config.php 11902 2009-07-15 01:07:23Z dmitrya $
+* @version	$Id: reviews_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'rev',
 
@@ -184,29 +186,37 @@
 
 		'Grids' => Array (
 			'Default' => Array (
-				'Icons' => Array ('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'),
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					0 => 'icon16_disabled.png',
+					1 => 'icon16_item.png',
+					2 => 'icon16_pending.png',
+				),
 				'Fields' => Array (
-					'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-					'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'filter_block' => 'grid_like_filter'),
-					'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter'),
-					'CreatedOn' => Array( 'title'=>'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
-					'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
-					'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter'),
+					'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+					'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
+					'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+					'CreatedOn' => Array( 'title'=>'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+					'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+					'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
 				),
 			),
 
 			'ReviewsSection' => Array (
-				'Icons' => Array ('default'=>'icon16_custom.gif',1=>'icon16_review.gif',2=>'icon16_review_pending.gif',0=>'icon16_review_disabled.gif'),
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					0 => 'icon16_disabled.png',
+					1 => 'icon16_item.png',
+					2 => 'icon16_pending.png',
+				),
 				'Fields' => Array (
-					'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-					'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter'),
-					'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter'),
-					'CreatedOn' => Array( 'title'=>'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'),
-					'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
-					'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter'),
+					'ReviewId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+					'ReviewText' => Array( 'title'=>'la_col_ReviewText', 'data_block' => 'grid_reviewtext_td', 'filter_block' => 'grid_like_filter', 'width' => 210, 'first_chars' => 200, ),
+					'ReviewedBy' => Array( 'title'=>'la_col_ReviewedBy', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+					'CreatedOn' => Array( 'title'=>'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+					'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+					'Rating' => Array( 'title'=>'la_col_Rating', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
 				),
 			),
 		),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_cat_disabled.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/install/incs/script.js
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/install/incs/script.js	(.../script.js)	(revision 12127)
+++ branches/5.1.x/core/install/incs/script.js	(.../script.js)	(revision 12657)
@@ -1,8 +1,7 @@
-
-function swap_image($img_id, $src) {
-	document.getElementById($img_id).src = 'incs/img/' + $src;
-}
-
 function continue_install() {
 	document.getElementById('install_form').submit();
+}
+
+function RemoveTranslationLink($label) {
+	return $label;
 }
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_add_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/install/step_templates/install_setup.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 12127)
+++ branches/5.1.x/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 12657)
@@ -1,19 +1,19 @@
 <tr class="table-color2">
 	<td colspan="2">
-		In order to use the installation tool, please provide your Intechnic account information:
+		In order to use this installation tool, please identify yourself using the root password!
 	</td>
 </tr>
 <tr class="table-color2">
 	<td class="text">
-		<b>Username<span class="error">*</span>:</b>
+		<b>Username<span class="error"> *</span>:</b>
 	</td>
 	<td width="80%">
 		<input type="text" name="login" value="<?php echo $this->GetVar('login'); ?>" class="text" />
 	</td>
 </tr>
 <tr class="table-color2">
 	<td class="text">
-		<b>Password<span class="error">*</span>:</b>
+		<b>Password<span class="error"> *</span>:</b>
 	</td>
 	<td>
 		<input type="password" name="password" class="text" />
@@ -33,11 +33,11 @@
 
 	$options = 	Array (
 						'upgrade'			=>	'Upgrade In-Portal',
-						'clean_reinstall'	=>	'Clean out the In-Portal database and reinstall',
-						2					=>	'Install to a new database',
+						'clean_reinstall'	=>	'Reinstall In-Portal',
+						2					=>	'Install In-Portal to a New Database',
 						'update_license'	=>	'Update License Information',
-						'db_reconfig'		=>	'Change Database Configuration',
-						'fix_paths'			=>	'Fix Paths',
+						'db_reconfig'		=>	'Update Database Configuration',
+						'fix_paths'			=>	'Update Installation Paths',
 				);
 
 	$upgradable_modules = $this->GetUpgradableModules();
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_modify_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/login.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/login.tpl	(.../login.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/login.tpl	(.../login.tpl)	(revision 12657)
@@ -1,7 +1,8 @@
 <inp2:m_Set skip_last_template="1"/>
+<inp2:adm_HTTPAuth result_to_var="http_auth"/>
 <inp2:m_include t="incs/header" nobody="yes"/>
 
-<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF" onload="document.getElementById($form_name).login.focus();">
+<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF">
 	<style type="text/css">
 	<!--
 		html, body {
@@ -18,7 +19,7 @@
 			height: 160px;
 			left: 0px;
 			right: 0px;
-			background: url('img/login/login-top.jpg') no-repeat right top #007bf4;
+			background: url('img/login/login-top.png') no-repeat right top #007bf4;
 			z-index: 2;
 		}
 
@@ -37,7 +38,7 @@
 			height: 160px;
 			left: 0px;
 			right: 0px;
-			background: url('img/login/login-bottom.jpg') no-repeat left bottom #007bf4;
+			background: url('img/login/login-bottom.png') no-repeat left bottom #007bf4;
 			z-index: 2;
 		}
 
@@ -93,38 +94,38 @@
 
 	<div id="header-div"></div>
 
-		<div id="body-div">
+	<div id="body-div">
 
-			<div id="outer">
+		<div id="outer">
 
-			  	<div id="inner" align="center">
+		  	<div id="inner" align="center">
 
-				  	<div id="logo" align="center" style="margin-bottom: 20px;">
-				  		<table class="head-table" style="background: none;">
-				  		<tr>
-				  			<inp2:m_if check="adm_AdminSkin" type="LogoLogin">
-				  				<td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_GetConfig var='Site_Name'/>"></td>
-				  			<inp2:m_else/>
-				  				<inp2:m_if check="adm_AdminSkin" type="Logo">
-					  				<td>
-					  					<img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_GetConfig var='Site_Name'/>">
-					  				</td>
-				  				</inp2:m_if>
+			  	<div id="logo" align="center" style="margin-bottom: 20px;">
+			  		<table class="head-table" style="background: none;">
+			  		<tr>
+			  			<inp2:m_if check="adm_AdminSkin" type="LogoLogin">
+			  				<td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_GetConfig var='Site_Name'/>"></td>
+			  			<inp2:m_else/>
+			  				<inp2:m_if check="adm_AdminSkin" type="Logo">
+				  				<td>
+				  					<img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_GetConfig var='Site_Name'/>"><br/>
+				  					<inp2:m_if check="adm_AdminSkin" type="LogoBottom">
+				  						<img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="<inp2:m_GetConfig var='Site_Name'/>">
+				  					</inp2:m_if>
+				  				</td>
+			  				</inp2:m_if>
 
-				  				<td align="left" valign="middle" style="font-family: impact, sans-serif;">
-					  				<span style="font-size: 48px; font-weight: bold;"><inp2:m_GetConfig var="Site_Name"/></span>
+			  				<td align="left" valign="middle">
+				  				<span style="font-size: 48px; color: black;"><inp2:m_GetConfig var="Site_Name"/></span>
+				  			</td>
+			  			</inp2:m_if>
+			  		</tr>
+			  		</table>
+			  	</div>
 
-					  				<inp2:m_if check="m_GetConfig" name="SiteNameSubTitle">
-					  					<br/><span style="font-size: 20px;"><inp2:m_GetConfig name="SiteNameSubTitle"/></span>
-					  				</inp2:m_if>
-					  			</td>
-				  			</inp2:m_if>
-				  		</tr>
-				  		</table>
-				  	</div>
-
-				  	<div id="form" align="center">
-					    	<table class="login-table">
+			  	<div id="form" align="center">
+			  		<inp2:m_if check="m_Param" name="http_auth">
+				    	<table class="login-table">
 			      			<tr>
 			      				<td colspan="2" style="text-align: center">
 			      				<inp2:m_if check="u.current_HasError" field="any">
@@ -150,82 +151,93 @@
 		          				<td colspan="2" align="center" style="padding: 5px 15px 10px 15px;">
 		              				<input type="submit" name="login_button" value="<inp2:m_phrase name="la_Login"/>" class="kx-login-button roundbutton"></td>
 		          			</tr>
+						</table>
+					<inp2:m_else/>
+						<h1 style="color: red;">401 Authentication Required</h1>
+					</inp2:m_if>
+			    </div>
 
-							</table>
-				    </div>
-
-				</div>
-
 			</div>
 
 		</div>
 
-		<div id="footer-div"></div>
+	</div>
 
-	<input type="hidden" name="events[u]" value="OnLogin"/>
-	<input type="hidden" name="next_template" value="<inp2:m_if check="m_GetEquals" name="next_template" value="">index<inp2:m_else/><inp2:m_get var="next_template"/></inp2:m_if>"/>
-	<input type="hidden" name="skip_last_template" value="1"/>
+	<div id="footer-div"></div>
 
-	<script type="text/javascript">
-		var a_parent = window.parent;
-		var to_close = new Array();
+	<inp2:m_if check="m_Param" name="http_auth">
+		<input type="hidden" name="events[u]" value="OnLogin"/>
+		<input type="hidden" name="next_template" value="<inp2:m_if check="m_GetEquals" name="next_template" value="">index<inp2:m_else/><inp2:m_get var="next_template"/></inp2:m_if>"/>
+		<input type="hidden" name="skip_last_template" value="1"/>
 
-		function redirect() {
-//			alert('running redirect in "' + window.name + '"');
-//			window.name = 'redirect';
-			var $main_frame = getFrame('main');
-			a_parent = window;
+		<script type="text/javascript">
 
-			try {
-				var i = 0;
-				while (i < 10) {
-					i++;
-					var $opener = $main_frame.getWindowOpener(a_parent);
-//					console.log('window: ', a_parent.name, '; opener: ', $opener ? $opener.name : null);
+			$(document).ready(
+				function() {
+					$("input[name='login']").focus();
+				}
+			);
 
-					if ($opener) {
-						to_close.push(a_parent);
-						a_parent = $opener;
-						continue;
-					}
+			var a_parent = window.parent;
+			var to_close = new Array();
 
-					if (a_parent.name == 'main_frame') {
-						break;
-					}
+			function redirect() {
+	//			alert('running redirect in "' + window.name + '"');
+	//			window.name = 'redirect';
+				var $main_frame = getFrame('main');
+				a_parent = window;
 
-					if (a_parent.parent && a_parent.parent.name != a_parent.name) {
-						a_parent = a_parent.parent;
-						continue;
+				try {
+					var i = 0;
+					while (i < 10) {
+						i++;
+						var $opener = $main_frame.getWindowOpener(a_parent);
+	//					console.log('window: ', a_parent.name, '; opener: ', $opener ? $opener.name : null);
+
+						if ($opener) {
+							to_close.push(a_parent);
+							a_parent = $opener;
+							continue;
+						}
+
+						if (a_parent.name == 'main_frame') {
+							break;
+						}
+
+						if (a_parent.parent && a_parent.parent.name != a_parent.name) {
+							a_parent = a_parent.parent;
+							continue;
+						}
 					}
 				}
-			}
-			catch (err) {
-				// another website is opened in parent window
-				alert('Error while trying to access window opener: [' + err.message + ']');
-				i = 10;
-			}
+				catch (err) {
+					// another website is opened in parent window
+					alert('Error while trying to access window opener: [' + err.message + ']');
+					i = 10;
+				}
 
-			if (i < 10) {
-//				console.log('to close: ', to_close);
-				setTimeout(close_windows, 100);
+				if (i < 10) {
+	//				console.log('to close: ', to_close);
+					setTimeout(close_windows, 100);
+				}
 			}
-		}
 
-		function close_windows() {
-			page = '<inp2:m_t t="index" expired="1" escape="1" no_amp="1" m_wid=""/>'; // a_parent.location.href + '?expired=1';
-//			alert('redirecting ' + a_parent.name + ' to ' + page);
-			a_parent.location.href = page;
+			function close_windows() {
+				page = '<inp2:m_t t="index" expired="1" escape="1" no_amp="1" m_wid=""/>'; // a_parent.location.href + '?expired=1';
+	//			alert('redirecting ' + a_parent.name + ' to ' + page);
+				a_parent.location.href = page;
 
-//			alert('closing ' + to_close.length + ' windows');
-			for (var c = (to_close.length - 1); c >= 0; c--) {
-//				alert('closing ' + to_close[c].name);
-				window_close(to_close[c]);
+	//			alert('closing ' + to_close.length + ' windows');
+				for (var c = (to_close.length - 1); c >= 0; c--) {
+	//				alert('closing ' + to_close[c].name);
+					window_close(to_close[c]);
+				}
 			}
-		}
 
-		if (window.top.frames.length > 0) {
-			redirect();
-		}
-	</script>
+			if (window.top.frames.length > 0) {
+				redirect();
+			}
+		</script>
+	</inp2:m_if>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.1.x/core/units/custom_data/custom_data_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/custom_data/custom_data_config.php	(.../custom_data_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/custom_data/custom_data_config.php	(.../custom_data_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_data_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: custom_data_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'cdata',
 
@@ -44,6 +46,4 @@
 		    'CustomDataId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 		    'ResourceId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 		),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_e-mail-settings.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_image_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/general/libchart/classes/view/axis/Bound.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/axis/Bound.php	(.../Bound.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/axis/Bound.php	(.../Bound.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * Object representing the bounds of a dataset (its minimal and maximal values) on its vertical axis.
 	 * The bounds are automatically calculated from a XYDataSet or XYSeriesDataSet.
@@ -142,5 +144,4 @@
 		public function setUpperBound($upperBound) {
 			$this->upperBound = $upperBound;
 		}
-	 }
-?>
\ No newline at end of file
+	 }
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_file_disabled.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/theme_files/theme_file_eh.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/theme_files/theme_file_eh.php	(.../theme_file_eh.php)	(revision 12127)
+++ branches/5.1.x/core/units/theme_files/theme_file_eh.php	(.../theme_file_eh.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: theme_file_eh.php 11963 2009-07-22 15:13:17Z alex $
+* @version	$Id: theme_file_eh.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class ThemeFileEventHandler extends kDBEventHandler {
 
 		/**
@@ -201,7 +203,7 @@
 		function OnSaveLayout(&$event)
 		{
 			$event->status = erSTOP;
-			if (($this->Application->GetVar('ajax') != 'yes') || (EDITING_MODE != EDITING_MODE_LAYOUT)) {
+			if (($this->Application->GetVar('ajax') != 'yes') || (EDITING_MODE != EDITING_MODE_DESIGN)) {
 				return ;
 			}
 
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_reviews.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/parser/template_parser.php
===================================================================
diff -u -N
--- branches/5.1.x/core/kernel/parser/template_parser.php	(revision 12127)
+++ branches/5.1.x/core/kernel/parser/template_parser.php	(revision 0)
@@ -1,766 +0,0 @@
-<?php
-/**
-* @version	$Id: template_parser.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-k4_include_once(KERNEL_PATH.'/parser/tags.php');
-k4_include_once(KERNEL_PATH.'/parser/construct_tags.php');
-
-class TemplateParser extends kBase {
-	var $Template;
-	var $Output = '';
-	var $Position = 0;
-	var $LastPosition = 0;
-
-	var $Ses;
-	var $Recursion = Array();
-	var $RecursionIndex = 0;
-	var $SkipMode = 0;
-	var $Params = Array();
-	var $Pattern = Array();
-	var $ForSort = Array();
-	var $Values = Array();
-	var $Buffers = Array();
-	var $Args;
-
-	var $ParamsRecursionIndex = 0;
-	var $ParamsStack = Array();
-
-	var $CompiledBuffer;
-
-	var $DataExists = false;
-
-	var $FromPreParseCache = false;
-
-	function TemplateParser()
-	{
-		parent::kBase();
-		$this->Ses =& $this->Application->recallObject('Session');
-	}
-
-	function AddParam($pattern, $value, $dont_sort=0)
-	{
-		$this->ForSort[] = Array($pattern, $value);
-		if (!$dont_sort) //used when mass-adding params, to escape sorting after every new param
-			$this->SortParams(); //but do sort by default!
-	}
-
-	//We need to sort params by its name length desc, so that params starting with same word get parsed correctly
-	function SortParams()
-	{
-		uasort($this->ForSort, array ("TemplateParser", "CmpParams"));
-
-//		 commented out by Kostja, otherwise when rednerElement is done into var (result_to_var) the other params are reset
-//		$this->Pattern = Array();
-//		$this->Values = Array();
-		foreach($this->ForSort as $pair)
-		{
-			$this->Pattern[] = $pair[0];
-			$this->Values[] = $pair[1];
-		}
-	}
-
-	function CmpParams($a, $b)
-	{
-		$a_len = strlen($a[0]);
-		$b_len = strlen($b[0]);
-		if ($a_len == $b_len) return 0;
-		return $a_len > $b_len ? -1 : 1;
-	}
-
-	function SetParams($params, $for_parsing=true)
-	{
-		if (!is_array($params)) $params = Array();
-
-		$this->ForSort = array();
-		$this->Params = $params;
-		$this->ParamsStack[$this->ParamsRecursionIndex] = $params;
-
-		if (!$for_parsing) return ;
-
-		foreach ($params as $key => $val) {
-			$this->AddParam('/[{]{0,1}\$'.$key.'[}]{0,1}/i', $val, 1); //Do not sort every time
-		}
-		$this->SortParams(); //Sort once after adding is done
-	}
-
-	/**
-	 * Returns parser parameter value at specified deep level
-	 *
-	 * @param string $name
-	 * @param int $deep_level if greather then 0 then use from ParamsStack
-	 * @return mixed
-	 */
-	function GetParam($name, $deep_level = 0)
-	{
-		if ($deep_level > 0) {
-			return isset($this->ParamsStack[$deep_level][$name]) ? $this->ParamsStack[$deep_level][$name] : false;
-		}
-
-		return isset($this->Params[$name]) ? $this->Params[$name] : false;
-	}
-
-	/**
-	 * Set's template parser parameter, that could be retrieved from template
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 */
-	function SetParam($name, $value)
-	{
-		$this->Params[strtolower($name)] = $value;
-		$this->AddParam('/[{]{0,1}\$'.$name.'[}]{0,1}/i', $value, $this->FromPreParseCache);
-		$this->ParamsStack[$this->ParamsRecursionIndex][$name] = $value;
-	}
-
-	function SetBuffer($body)
-	{
-		$this->Buffers[$this->RecursionIndex] = $body;
-	}
-
-	function GetBuffer()
-	{
-		return $this->Buffers[$this->RecursionIndex];
-	}
-
-	function GetCode()
-	{
-		return $this->Code[$this->RecursionIndex];
-	}
-
-	function AppendBuffer($append)
-	{
-		$this->Buffers[$this->RecursionIndex] .= $append;
-		$this->AppendCode( $this->ConvertToCode($append) );
-	}
-
-	function AppendOutput($append, $append_code=false)
-	{
-		if ($this->SkipMode == parse) {
-			$this->Output .= $append; //append to Ouput only if we are parsing
-			if ($append_code) $this->AppendCompiledHTML($append);
-		}
-		elseif ($this->SkipMode == skip) {
-			if ($append_code) $this->AppendCompiledHTML($append);
-		}
-		elseif ($this->SkipMode == skip_tags) {
-			$this->AppendBuffer($append); //append to buffer if we are skipping tags
-		}
-	}
-
-	function ConvertToCode($data)
-	{
-		$data = str_replace("\\", "\\\\", $data); // escape any "\"
-		$data = str_replace("'", "\'", $data); // escape "'"
-
-		$code = '$o .= \''. $data .'\';';
-		$code = explode("\n", $code);
-		return $code;
-	}
-
-	function AppendCode($code, $level_offset=0)
-	{
-		if ($this->RecursionIndex+$level_offset <= 0 ) $level_offset = 0;
-		if (defined('EXPERIMENTAL_PRE_PARSE')) {
-			if (!isset($this->Code[$this->RecursionIndex+$level_offset])) {
-				$this->Code[$this->RecursionIndex+$level_offset] = Array();
-			}
-			if (is_array($code)) {
-				foreach ($code as $line) {
-					$this->Code[$this->RecursionIndex+$level_offset][] = rtrim($line, "\n")."\n";
-				}
-			}
-			else {
-				$this->Code[$this->RecursionIndex+$level_offset][] .= rtrim($code, "\n")."\n";
-			}
-		}
-	}
-
-	function PrepareCompiledFunction($f_name, $f_body, $add_reference=true)
-	{
-		$real_name = 'f_'.abs(crc32($this->TemplateName)).'_'.$f_name;
-		$real_code = '';
-		if (defined('EXPERIMENTAL_PRE_PARSE')) {
-			// if such function already compiled
-			if ( isset($this->Application->CompiledFunctions[$f_name]) ||
-						function_exists($real_name)
-					)
-			{
-				if (!isset($this->Application->CompiledFunctions[$f_name])) {
-					$real_name = $real_name.'_';
-				}
-				else {
-					$real_name = $this->Application->CompiledFunctions[$f_name].'_';
-				}
-			}
-
-			if (is_array($f_body)) {
-				$real_body = '';
-				foreach ($f_body as $line) {
-					if (preg_match('/^\/\*LAMBDA-ONLY\*\//', $line)) continue;
-					$real_body .= "\t\t".rtrim($line, "\n")."\n";
-				};
-				$f_body = $real_body;
-			}
-			else {
-				$f_body = preg_replace('/\/\*LAMBDA-ONLY\*\/.*/m', '', $f_body);
-			}
-
-			$ref = "\t".'$application->PreParsedBlocks[\''.$f_name.'\'] = \''.$real_name.'\';'."\n";
-			if ($add_reference) $real_code .= $ref;
-			$real_code .= 'if (!function_exists(\''.$real_name.'\')) {'."\n";
-				$real_code .= "\t".'function '.$real_name.'($params)'."\n\t{\n";
-				$real_code .= $f_body;
-				$real_code .= "\t}\n\n";
-			$real_code .= '}'."\n";
-
-			/*if (defined('DEBUG_MODE') && DEBUG_MODE && defined('DBG_PRE_PARSE') && DBG_PRE_PARSE) {
-				// this shows newly compiled functions (blocks)
-				global $debugger;
-				$f_body = "\t".'function '.$real_name.'($params)'."\n\t{\n".$f_body."\t}\n\n";
-				$debugger->appendHTML($debugger->highlightString($f_body));
-			}*/
-			$this->Application->CompiledFunctions[$f_name] = $real_name;
-
-			return array($real_name, $real_code, $ref);
-		}
-	}
-
-	function AppendCompiledFunction($f_name, $f_body)
-	{
-		$f = $this->PrepareCompiledFunction($f_name, $f_body);
-		$this->CompiledBuffer .= $f[1];
-	}
-
-	function AppendCompiledCode($code)
-	{
-		if (defined('EXPERIMENTAL_PRE_PARSE')) {
-			if (is_array($code)) {
-				foreach ($code as $line) {
-					if (preg_match('/^\/\*LAMBDA-ONLY\*\//', $line)) continue;
-					$this->CompiledBuffer .= "\t".rtrim($line, "\n")."\n";
-				}
-			}
-			else {
-				$this->CompiledBuffer .= $code;
-			}
-			$this->CompiledBuffer .= "\t".'echo $o;'."\n\t".'$o = \'\';'."\n";
-		}
-	}
-
-	function AppendCompiledHTML($append)
-	{
-		if (defined('EXPERIMENTAL_PRE_PARSE')) {
-			$this->CompiledBuffer .= '?'.'>'."\n";
-			$this->CompiledBuffer .= rtrim($append, "\t");
-			$this->CompiledBuffer .= '<'.'?php'."\n";
-		}
-	}
-
-	function ResetCode()
-	{
-		$this->Code[$this->RecursionIndex] = Array();
-	}
-
-	function FindTag2()
-	{
-		$openings = Array('<%' => '%>', '<inp2:' => Array('>', '/>'), '</inp2:' => '>', '</inp2>' => '', '<!--' => '-->');
-
-		$tag_open_pos = false;
-		foreach ($openings as $an_opening => $closings) {
-			$pos = strpos($this->Template, $an_opening, $this->Position);
-			if ($pos !== false && ($tag_open_pos === false || (int) $pos <= (int) $tag_open_pos)) {
-				$tag_open_pos = $pos;
-				$open_len = strlen($an_opening);
-				$opening_tag = $an_opening;
-				$tag_closings = $closings;
-			}
-		}
-
-		if ($tag_open_pos === false) { //If no tags left - adding all other data
-			$this->AppendOutput(substr($this->Template, $this->Position), true);
-			return false;
-		}
-
-		//Adding all data before tag open
-		$this->AppendOutput(substr($this->Template, $this->Position, $tag_open_pos - $this->Position), true);
-
-		if (is_array($tag_closings)) {
-			$tag_close_pos = false;
-			foreach ($tag_closings as $a_closing) {
-				$pos = strpos($this->Template, $a_closing, $tag_open_pos);
-				if ($pos !== false && ($tag_close_pos === false || (int) $pos <= (int) $tag_close_pos)) {
-					$tag_close_pos = $pos;
-					$closing_tag = $a_closing;
-				}
-			}
-		}
-		elseif ($opening_tag == '</inp2>') {
-			$closing_tag = '';
-			$tag_close_pos = $tag_open_pos + $open_len;
-		}
-		else {
-			$closing_tag = $tag_closings;
-			$tag_close_pos = strpos($this->Template, $closing_tag, $tag_open_pos);
-		}
-		$close_len = strlen($closing_tag);
-
-
-		// Cutting trailing line-breaks after tags (same way PHP does it)
-		if (substr($this->Template, $tag_close_pos+$close_len, 2) == "\r\n") {
-			$this->Template = substr_replace($this->Template, '', $tag_close_pos, 2);
-		}
-		elseif (substr($this->Template, $tag_close_pos+$close_len, 1) == "\n") {
-			$this->Template = substr_replace($this->Template, '', $tag_close_pos, 1);
-		}
-
-
-		//Cutting out the tag itself
-		$tag = substr($this->Template, $tag_open_pos + $open_len, $tag_close_pos - $tag_open_pos - $open_len);
-
-
-		if ($opening_tag == '<inp2:') {
-			//getting prefix_tag upto first space, tab or line break into regs[1]
-			preg_match("/^([^ \t\n]*)(.*)/", $tag, $regs);
-			$tag_part = $regs[1];
-
-			if (strpos($tag_part, '_') !== false) {
-				list($prefix, $the_tag) = explode('_', $tag, 2);
-				/*preg_match('/(.*)_(.*)/', $tag_part, $rets);
-				$prefix = $rets[1];
-				$the_tag = $rets[2].$regs[2];*/
-
-				$tag = $prefix.':'.$the_tag;
-			}
-			else {
-				$the_tag = $tag;
-				$tag = ':'.$tag;
-			}
-		}
-
-		if ($opening_tag == '</inp2>') { //empty closing means old style in-portal if <inp2:tag>....</inp2>
-			$tag = 'm:endif';
-		}
-
-		if ($opening_tag == '</inp2:') {
-			preg_match("/^([^ \t\n]*)(.*)/", $tag, $regs);
-			$tag_part = $regs[1];
-			if (strpos($tag_part, '_') !== false) {
-				list($prefix, $the_tag) = explode('_', $tag, 2);
-				$tag = $prefix.':'.$the_tag;
-			}
-			$tag .= ' _closing_tag_="1"';
-		}
-
-		// if there is no prefix for the tag
-		if (strpos($tag, ':') === 0) {
-			$prefix = getArrayValue($this->Params, 'PrefixSpecial');
-			$tag = $prefix.$tag.' _auto_prefix_="1"';
-		}
-
-		// temporary - for backward compatability with in-portal style if
-		$compat_tags = array('m_if', 'm_DefineElement', 'm_Capture', 'm_RenderElement');
-		if ($opening_tag == '<inp2:' && $closing_tag == '>' && !in_array($tag_part, $compat_tags)) {
-			if (strpos($the_tag, ' ') !== false) {
-				list($function, $params) = explode(' ', $the_tag, 2);
-			}
-			else {
-				$function = $the_tag;
-				$params = '';
-			}
-			$tag = 'm:if prefix="'.$prefix.'" function="'.$function.'" '.$params;
-		}
-
-		if ($opening_tag == '<!--') {
-			if ($this->Application->IsAdmin()) {
-				$this->AppendOutput('<!-- '.htmlspecialchars($tag). '-->');
-			}
-			else {
-				$this->AppendOutput('<!-- '.$tag. '-->');
-				$this->AppendCompiledHTML('<!-- '.$tag. '-->');
-			}
-			$tag = '__COMMENT__';
-		}
-
-		if ($closing_tag == '>') $tag .= ' _short_closing_="1"';
-
-		$this->Position = $tag_close_pos + $close_len;
-		return $tag;
-	}
-
-	function CurrentLineNumber()
-	{
-		return substr_count(substr($this->Template, 0, $this->Position), "\n")+1;
-	}
-
-	function SkipModeName()
-	{
-		switch ($this->SkipMode) {
-			case skip: return 'skip';
-			case skip_tags: return 'skip_tags';
-			case parse: return 'parse';
-		}
-	}
-
-	/**
-	 * Recursive mkdir
-	 *
-	 * @param string $dir
-	 * @param string $base_path base path to directory where folders should be created in
-	 */
-	function CheckDir($dir, $base_path = '')
-	{
-		if (file_exists($dir)) {
-			return;
-		}
-		else {
-			// remove $base_path from beggining because it is already created during install
-			$dir = preg_replace('/^'.preg_quote($base_path.'/', '/').'/', '', $dir, 1);
-			$segments = explode('/', $dir);
-			$cur_path = $base_path;
-
-			foreach ($segments as $segment) {
-				// do not add leading / for windows paths (c:\...)
-				$cur_path .= preg_match('/^[a-zA-Z]{1}:/', $segment) ? $segment : '/'.$segment;
-				if (!file_exists($cur_path)) {
-					mkdir($cur_path);
-				}
-			}
-		}
-	}
-
-	function ParseTemplate($name, $pre_parse = 1, $params=array(), $silent=0)
-	{
-		$this->FromPreParseCache = false;
-		if ($this->GetParam('from_inportal')) $pre_parse = 0;
-		if ($pre_parse) {
-			$pre_parsed = $this->Application->TemplatesCache->GetPreParsed($name);
-			if ($pre_parsed === false) {
-				// template not found -> don't compile
-				return '';
-			}
-
-			if ($pre_parsed && $pre_parsed['active']) { // active means good (not expired) pre-parsed cache
-				$this->FromPreParseCache = true;
-				$this->SetParams($params, 0); // 0 to disable params sorting and regexp generation - not needed when processing pre-parsed
-				ob_start();
-				if ($pre_parsed['mode'] == 'file') {
-					$this->TemplateName = str_replace(FULL_PATH, '', realpath($pre_parsed['fname']));
-					include($pre_parsed['fname']);
-				}
-				else {
-					eval('?'.'>'.$pre_parsed['content']);
-				}
-				$output = ob_get_contents();
-				ob_end_clean();
-			}
-			else {
-				$this->SetParams($params);
-
-				$this->CompiledBuffer .= '<'.'?php'."\n";
-				$this->CompiledBuffer .= 'global $application;'."\n";
-
-				$this->CompiledBuffer .= '$params =& $application->Parser->Params;'."\n";
-				$this->CompiledBuffer .= 'extract($params);'."\n";
-
-				$this->CompiledBuffer .= '$o = \'\';'."\n";
-
-				$body = $this->Application->TemplatesCache->GetTemplateBody($name, $silent);
-				$this->TemplateName = $name;
-				$output = $this->NewParse($body, $name);
-
-				$this->CompiledBuffer .= '?'.'>'."\n";
-
-				if (defined('SAFE_MODE') && SAFE_MODE) {
-					if (!isset($conn)) $conn =& $this->Application->GetADODBConnection();
-					$conn->Query('REPLACE INTO '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ('.$conn->qstr($pre_parsed['fname']).','.$conn->qstr($this->CompiledBuffer).','.adodb_mktime().')');
-				}
-				else {
-					$compiled = fopen($pre_parsed['fname'], 'w');
-					fwrite($compiled, $this->CompiledBuffer);
-					fclose($compiled);
-				}
-
-			}
-			if ( !$this->GetParam('from_inportal') && strpos($output, '<inp:') !== false) {
-				$inp1_parser =& $this->Application->recallObject('Inp1Parser');
-//				$name = $this->Application->TemplatesCache->GetTemplateFileName($name) . '-block:' . $name; // may be is needed (by Alex)
-				$output = $inp1_parser->Parse($name, $output);
-			}
-			return $output;
-		}
-
-		// pre-parse is OFF
-		$this->SetParams($params);
-		return $this->NewParse($this->Application->TemplatesCache->GetTemplateBody($name), $name, $pre_parse);
-	}
-
-	function NewParse($template, $name='unknown', $pre_parse = 1)
-	{
-		$this->Template = $template;
-		$this->TemplateName = $name;
-		$this->Position = 0;
-		$this->Output = '';
-		$this->TagHolder = new MyTagHolder();
-
-		$has_inp_tags = false;
-
-		if (!getArrayValue($this->Params, 'PrefixSpecial')) {
-			$this->Params['PrefixSpecial'] = '$PrefixSpecial';
-		}
-
-		//While we have more tags
-		while ($tag_data = $this->FindTag2())
-		{
-			if ($tag_data == '__COMMENT__') continue;
-			//Create tag object from passed tag data
-			if( $this->Application->isDebugMode() && constOn('DBG_SHOW_TAGS') )
-			{
-				global $debugger;
-				$debugger->appendHTML('mode: '.$this->SkipModeName().' tag '.$debugger->highlightString($tag_data).' in '.$debugger->getFileLink($debugger->getLocalFile(FULL_PATH.THEMES_PATH.'/'.$this->TemplateName).'.tpl', $this->CurrentLineNumber(), '', true));
-			}
-			$tag =& $this->TagHolder->GetTag($tag_data, $this);
-
-			if (!$this->CheckRecursion($tag)) //we do NOT process closing tags
-			{
-				$tag->Process();
-			}
-		}
-		return $this->Output;
-	}
-
-	function Parse($template, $name='unknown', $pre_parse = 1)
-	{
-		$this->Template = $template;
-		$this->TemplateName = $name;
-		$this->Position = 0;
-		$this->Output = '';
-		$this->TagHolder = new MyTagHolder();
-
-		$has_inp_tags = false;
-
-		if ($this->GetParam('from_inportal')) $pre_parse = 0;
-
-		if (defined('EXPERIMENTAL_PRE_PARSE') && $pre_parse) {
-			$fname = $this->Application->TemplatesCache->GetRealFilename($this->TemplateName).'.php';
-
-			$fname = str_replace(FULL_PATH, FULL_PATH.'/kernel/cache', $fname);
-
-			if (!defined('SAFE_MODE') || !SAFE_MODE) {
-				$this->CheckDir(dirname($fname), FULL_PATH.'/kernel/cache');
-			}
-
-			$tname = $this->Application->TemplatesCache->GetRealFilename($this->TemplateName).'.tpl';
-			$output = '';
-			$is_cached = false;
-			ob_start();
-			if (defined('SAFE_MODE') && SAFE_MODE) {
-				$conn =& $this->Application->GetADODBConnection();
-				$cached = $conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'Cache WHERE VarName = "'.$fname.'"');
-				if ($cached !== false && $cached['Cached'] > filemtime($tname)) {
-					eval('?'.'>'.$cached['Data']);
-					$is_cached = true;
-				}
-			}
-			else {
-				if (file_exists($fname) && file_exists($tname) && filemtime($fname) > filemtime($tname)) {
-					include($fname);
-					$is_cached = true;
-				}
-			}
-			$output = ob_get_contents();
-			ob_end_clean();
-
-			if ( $is_cached && !$this->GetParam('from_inportal') ) {
-				if ( strpos($output, '<inp:') !== false) {
-					$inp1_parser =& $this->Application->recallObject('Inp1Parser');
-					$output = $inp1_parser->Parse($name, $output);
-				}
-				return $output;
-			}
-
-			$this->CompiledBuffer .= '<'.'?php'."\n";
-			$this->CompiledBuffer .= 'global $application;'."\n";
-
-			$this->CompiledBuffer .= '$params =& $application->Parser->Params;'."\n";
-			$this->CompiledBuffer .= 'extract($params);'."\n";
-
-			$this->CompiledBuffer .= '$o = \'\';'."\n";
-		}
-
-		if (!getArrayValue($this->Params, 'PrefixSpecial')) {
-			$this->Params['PrefixSpecial'] = '$PrefixSpecial';
-		}
-
-		//While we have more tags
-		while ($tag_data = $this->FindTag2())
-		{
-			if ($tag_data == '__COMMENT__') continue;
-			//Create tag object from passed tag data
-			if( $this->Application->isDebugMode() && constOn('DBG_SHOW_TAGS') )
-			{
-				global $debugger;
-				$debugger->appendHTML('mode: '.$this->SkipModeName().' tag '.$debugger->highlightString($tag_data).' in '.$debugger->getFileLink($debugger->getLocalFile(FULL_PATH.THEMES_PATH.'/'.$this->TemplateName).'.tpl', $this->CurrentLineNumber(), '', true));
-			}
-//				$tag = new MyTag($tag_data, $this);
-			$tag =& $this->TagHolder->GetTag($tag_data, $this);
-
-			if (!$this->CheckRecursion($tag)) //we do NOT process closing tags
-			{
-				$tag->Process();
-			}
-		}
-
-		if ( !$this->GetParam('from_inportal') ) {
-			if ( strpos($this->Output, '<inp:') !== false) {
-				$inp1_parser =& $this->Application->recallObject('Inp1Parser');
-				$this->Output = $inp1_parser->Parse($name, $this->Output);
-				$has_inp_tags = true;
-			}
-		}
-
-
-		if (defined('EXPERIMENTAL_PRE_PARSE') && $pre_parse && !$has_inp_tags) {
-//			$this->CompiledBuffer .= 'echo $o;'."\n";
-			$this->CompiledBuffer .= '?'.'>'."\n";
-
-			if (defined('SAFE_MODE') && SAFE_MODE) {
-				if (!isset($conn)) $conn =& $this->Application->GetADODBConnection();
-				$conn->Query('REPLACE INTO '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ('.$conn->qstr($fname).','.$conn->qstr($this->CompiledBuffer).','.adodb_mktime().')');
-			}
-			else {
-				$compiled = fopen($fname, 'w');
-				fwrite($compiled, $this->CompiledBuffer);
-				fclose($compiled);
-			}
-		}
-
-		return $this->Output;
-	}
-
-	function ParseBlock($params, $force_pass_params=0, $as_template=false)
-	{
-		if( $this->Application->isDebugMode() && constOn('DBG_SHOW_TAGS') )
-		{
-			global $debugger;
-			$debugger->appendHTML('ParseBlock '.$params['name'].' pass_params is '.$params['pass_params'].' force is '.$force_pass_params.' in '.$debugger->getFileLink($debugger->getLocalFile(FULL_PATH.THEMES_PATH.'/'.$this->TemplateName).'.tpl', $this->CurrentLineNumber(), '', true));
-
-		}
-		/*if ( $this->Application->isDebugMode() && constOn('DBG_PRE_PARSE') ) {
-			global $debugger;
-			$debugger->CurrentPreParsedBlock = $params['name'];
-		}*/
-		if (defined('EXPERIMENTAL_PRE_PARSE')) {
-			$this->MainParser = false;
-			if (isset($this->Application->PreParsedBlocks[$params['name']]) ) {
-
-				if ($this->ParamsRecursionIndex == 0) {
-					$this->ParamsStack[$this->ParamsRecursionIndex] = $this->Params;
-				}
-
-				if (isset($params['pass_params']) || $force_pass_params) {
-					$pass_params = array_merge($this->ParamsStack[$this->ParamsRecursionIndex], $params);
-				}
-				else {
-					$pass_params = $params;
-				}
-
-				$this->ParamsStack[++$this->ParamsRecursionIndex] = $pass_params;
-				$this->Params = $pass_params;
-
-				$f = $this->Application->PreParsedBlocks[$params['name']];
-
-//					$this->ParamsRecursionIndex--;
-
-				//$this->SetParams($params);
-				if( !isset($pass_params['PrefixSpecial']) && isset($pass_params['prefix']) ) $pass_params['PrefixSpecial'] = $pass_params['prefix'];
-
-				$ret = $f($pass_params);
-
-				if (isset($params['return_params']) && $params['return_params']) {
-					$this->ParamsStack[$this->ParamsRecursionIndex - 1] = array_merge($this->ParamsStack[$this->ParamsRecursionIndex - 1], $this->ParamsStack[$this->ParamsRecursionIndex]);
-				}
-
-				unset($this->ParamsStack[$this->ParamsRecursionIndex--]);
-				$this->Params = $this->ParamsStack[$this->ParamsRecursionIndex];
-				$this->MainParser = true;
-				return defined('DBG_DECORATE_BLOCKS') && DBG_DECORATE_BLOCKS ? $this->decorateBlock($ret, $pass_params) : $ret;
-			}
-		}
-
-		$BlockParser =& $this->Application->makeClass('TemplateParser');
-		if (isset($params['pass_params']) || $force_pass_params) {
-			$BlockParser->SetParams(array_merge($this->Params, $params));
-		}
-		else
-			$BlockParser->SetParams($params);
-		$this->Application->Parser =& $BlockParser;
-		if (!isset($params['name'])) {
-			trigger_error('<b>***Error: Block name not passed to ParseBlock</b>', E_USER_ERROR);
-		}
-		$templates_cache =& $this->Application->recallObject('TemplatesCache');
-
-		$template_name = $as_template ? $params['name'] : $templates_cache->GetTemplateFileName($params['name']) . '-block:'.$params['name'];
-
-		$silent = getArrayValue($params, 'from_inportal') && !defined('DBG_TEMPLATE_FAILURE');
-
-		$o = $BlockParser->Parse(
-				$templates_cache->GetTemplateBody($params['name'], $silent),
-				$template_name
-			);
-		if (getArrayValue($params, 'BlockNoData') && !$BlockParser->DataExists) {
-			$template_name = $as_template ? $params['BlockNoData'] : $templates_cache->GetTemplateFileName($params['BlockNoData']) . '-block:'.$params['BlockNoData'];
-			$o = $BlockParser->Parse(
-				$templates_cache->GetTemplateBody($params['BlockNoData'], $silent),
-				$template_name
-			);
-		}
-
-		$this->Application->Parser =& $this;
-		$this->Application->Parser->DataExists = $this->Application->Parser->DataExists || $BlockParser->DataExists;
-
-		return $o;
-	}
-
-	function decorateBlock(&$block_content, $block_params)
-	{
-		if (preg_match('/^(\s*)<td(.*?)>(.*)<\/td>(.*)$/is', $block_content, $regs)) {
-			// block with td -> put div inside td
-			return $regs[1].'<td '.$regs[2].'><div title="'.$block_params['name'].'" style="border: 1px solid blue;">'.$regs[3].'</div></td>'.$regs[4];
-		}
-
-		return '<div title="'.$block_params['name'].'" style="border: 1px solid red;">'.$block_content.'</div>';
-	}
-
-	function Recurve(&$tag)
-	{
-		$this->Recursion[++$this->RecursionIndex] =& $tag;
-	}
-
-	function CheckRecursion(&$tag)
-	{
-		if ($this->RecursionIndex > 0) { //If we are inside the recursion
-			if ($this->Recursion[$this->RecursionIndex]->CheckRecursion($tag)) { //If we can close this recursion
-				unset($this->Recursion[$this->RecursionIndex--]); //unsetting current recursion level and decreasing it at the same time
-				return true; //we should inform not to process closing tag
-			}
-		}
-		return false;
-	}
-
-	function SetSkipMode($mode)
-	{
-		$this->SkipMode = $mode;
-	}
-}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/kernel/parser/tags.php
===================================================================
diff -u -N
--- branches/5.1.x/core/kernel/parser/tags.php	(revision 12127)
+++ branches/5.1.x/core/kernel/parser/tags.php	(revision 0)
@@ -1,475 +0,0 @@
-<?php
-/**
-* @version	$Id: tags.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-define ('parse', 0);
-define ('skip', 1);
-define ('skip_tags', 2);
-
-class MyTagHolder extends kBase {
-
-	var $_Tag;
-
-	function MyTagHolder()
-	{
-
-	}
-
-	function &GetTag($tag_data, &$parser, $inp_tag = 0)
-	{
-		if (!isset($this->_Tag)) {
-			$this->_Tag = new Tag($tag_data, $parser, $inp_tag);
-		}
-		else {
-//				$this->_Tag->Parser =& $parser;
-			$this->_Tag->TagData = $tag_data;
-			if ($tag_data != '') $this->_Tag->ParseTagData($tag_data);
-			$this->_Tag->NP =& $this->_Tag->NamedParams;
-		}
-		$this->_Tag->TemplateName = $parser->TemplateName;
-		return $this->_Tag;
-	}
-
-}
-
-class Tag extends kBase {
-	var $Processor;
-	var $Tag;
-	var $Params = Array();
-	var $NamedParams = Array();
-	var $NP;
-	var $TemplateName;
-	/**
-	 * Enter description here...
-	 *
-	 * @var TemplateParser
-	 */
-	var $Parser;
-	var $TagData = '';
-
-	function Tag($tag_data, &$parser, $inp_tag=0)
-	{
-		parent::kBase();
-		$this->Parser =& $parser;
-		$this->TagData = $tag_data;
-		if ($tag_data != '') $this->ParseTagData($tag_data);
-		$this->NP =& $this->NamedParams;
-	}
-
-	function CopyFrom(&$tag)
-	{
-		$this->Processor = $tag->Processor;
-		$this->Tag = $tag->Tag;
-		$this->TagData = $tag->TagData;
-		$this->Params = $tag->Params;
-		$this->NamedParams = $tag->NamedParams;
-		$this->Parser =& $tag->Parser;
-		$this->TemplateName = $tag->TemplateName;
-	}
-
-	function GetFullTag()
-	{
-		return '<%'.$this->TagData.'%>';
-	}
-
-	function RebuildTagData()
-	{
-		$res = $this->Processor.':'.$this->Tag.' ';
-		foreach ($this->NamedParams as $name => $value) {
-			$res .= "$name='$value' ";
-		}
-		return $res;
-	}
-
-	/**
-	 * Escape chars in phrase translation, that could harm parser to process tag
-	 *
-	 * @param string $text
-	 * @return string
-	 * @access private
-	 */
-	function EscapeReservedChars($text)
-	{
-		$reserved = Array('"',"'"); // =
-		$replacement = Array('\"',"\'"); // \=
-		return str_replace($reserved,$replacement,$text);
-	}
-
-
-	function ReplaceParams($tag_data)
-	{
-		//print_pre($this->Parser->Pattern, $tag_data);
-		$values = $this->Parser->Values;
-		foreach($values as $param_name => $param_value)
-		{
-			$values[$param_name] = $this->EscapeReservedChars($param_value);
-		}
-
-		if (is_array($this->Parser->Params)) {
-			$tag_data = preg_replace($this->Parser->Pattern, $values, $tag_data);
-		}
-		//echo "got: $tag_data<br>";
-		return $tag_data;
-	}
-
-	function PreParseReplaceParams($tag_data)
-	{
-		//print_pre($this->Parser->Pattern, $tag_data);
-		$values = $this->Parser->Values;
-		foreach($values as $param_name => $param_value)
-		{
-			$values[$param_name] = $this->EscapeReservedChars($param_value);
-		}
-
-		/*$patterns = Array();
-		if ( is_array($this->Parser->Args) ) {
-			foreach ($this->Parser->Args as $arg) {
-
-			}
-		}*/
-
-		if ($this->Parser->SkipMode == parse) {
-			if (is_array($this->Parser->Params)) {
-				$tag_data = preg_replace($this->Parser->Pattern, $values, $tag_data);
-			}
-		}
-		//echo "got: $tag_data<br>";
-		return $tag_data;
-	}
-
-	function CmpParams($a, $b)
-	{
-		$a_len = strlen($a);
-		$b_len = strlen($b);
-		if ($a_len == $b_len) return 0;
-		return $a_len > $b_len ? -1 : 1;
-	}
-
-	/**
-	 * Set's Prefix and Special for Tag object
-	 * based on ones from tagname
-	 *
-	 * @param string $tag_data
-	 * @access protected
-	 */
-	function ParseTagData($tag_data)
-	{
-		if (defined('EXPERIMENTAL_PRE_PARSE') ) {
-			$this->OriginalTagData = $tag_data;
-			$tag_data = $this->PreParseReplaceParams($tag_data) . ' ';
-		}
-		else {
-			$tag_data = $this->ReplaceParams($tag_data) . ' ';
-//			$tag_data = $this->Application->ReplaceLanguageTags($tag_data);
-		}
-
-		list ($key_data, $params) = split("[ \t\n]{1}", $tag_data, 2);
-		$key_data = trim($key_data);
-
-		$tmp=explode(':',$key_data);
-		$this->Tag=$tmp[1];
-
-		$tmp=$this->Application->processPrefix($tmp[0]);
-		$this->Prefix=$tmp['prefix'];
-		$this->Special=$tmp['special'];
-		$this->Processor=$this->Prefix;
-
-		if ($params != '') {
-			$this->ParseNamedParams($params);
-		}
-		else {
-			$this->NamedParams = array();
-		}
-	}
-
-	function ParseNamedParams($params_str)
-	{
-		$params = new Params($params_str);
-		$this->NamedParams = $params->_Params;
-	}
-
-	function GetParam($param)
-	{
-		if (isset($this->NP[$param]))
-			return $this->NP[$param];
-		else
-			return false;
-	}
-
-	/**
-	 * Process IF tags in specific way
-	 *
-	 */
-	function Process()
-	{
-		$short_closing =  false;
-		if (isset($this->NP['_short_closing_'])) {
-			unset($this->NP['_short_closing_']);
-			$this->TagData = str_replace(' _short_closing_="1"', '', $this->TagData);
-			$short_closing = true;
-		}
-		if ($this->Processor == 'm' || $this->Processor == 'm_TagProcessor') { //if we are procssing Main tags
-			if ($this->Tag == 'block' || $this->Tag == 'DefineElement' || ($this->Tag == 'RenderElement' && $short_closing)) {
-				$tag = new BlockTag('', $this->Parser);
-				$tag->CopyFrom($this);
-				$tag->Process();
-			}
-			elseif($this->Tag == 'Capture') {
-				$tag = new CaptureTag('', $this->Parser);
-				$tag->CopyFrom($this);
-				$tag->Process();
-			}
-			elseif ($this->Parser->SkipMode == skip_tags) {
-				return;
-			}
-			elseif (
-				$this->Tag == 'if' ||
-				$this->Tag == 'ifnot' ||
-				$this->Tag == 'else' ||
-				$this->Tag == 'elseif'
-				)
-			{
-				if ( defined('EXPERIMENTAL_PRE_PARSE') ) {
-					$this->Parser->AppendCompiledCode( $this->GetCode() );
-				}
-				$tag = new ConstructTag('', $this->Parser);
-				$tag->CopyFrom($this);
-				$tag->Process();
-			}
-			else {
-				if ($this->Parser->SkipMode == skip) {
-					if ( defined('EXPERIMENTAL_PRE_PARSE') ) {
-						$this->Parser->AppendCompiledCode( $this->GetCode() );
-					}
-					return;
-				}
-				$this->ProcessTag();
-				if ( defined('EXPERIMENTAL_PRE_PARSE') ) {
-					$this->Parser->AppendCompiledCode( $this->GetCode() );
-				}
-			}
-		}
-		else { //normal tags - processors other than main
-			if ($this->Parser->SkipMode == skip) { // inside if - add statements inside if to compiled code
-				if ( defined('EXPERIMENTAL_PRE_PARSE') ) {
-					$this->Parser->AppendCompiledCode( $this->GetCode() );
-				}
-				return;
-			}
-			elseif ($this->Parser->SkipMode == skip_tags) return; //do not parse if we skipping tags
-			$this->ProcessTag();
-			if ( defined('EXPERIMENTAL_PRE_PARSE') ) {
-				$this->Parser->AppendCompiledCode( $this->GetCode() );
-			}
-		}
-	}
-
-	/**
-	 * Set's Prefix and Special for TagProcessor
-	 * based on tag beeing processed
-	 *
-	 * @return string
-	 * @access protected
-	 */
-	function DoProcessTag()
-	{
-		// $tag->Prefix - l_TagProcessor
-		$tmp = $this->Application->processPrefix($this->Processor);
-
-		if (isset($this->NamedParams['_ignore_missing_'])) {
-			if (!$this->Application->prefixRegistred($tmp['prefix'])) return '';
-		}
-
-		$processor =& $this->Application->recallObject($tmp['prefix'].'_TagProcessor'); // $this->Processor
-
-		$tmp=explode('_',$tmp['prefix'],2);
-		$processor->Prefix=$tmp[0];
-		$processor->Special=$this->Special;
-
-		// pass_params for non ParseBlock tags :)
-		$parser_params = $this->Application->Parser->Params;
-		if( getArrayValue($this->NamedParams,'pass_params') )
-		{
-			unset( $this->NamedParams['pass_params'] );
-			$this->NamedParams = array_merge_recursive2($parser_params, $this->NamedParams);
-		}
-
-		return $processor->ProcessTag($this);
-	}
-
-	function ProcessTag()
-	{
-		$o = $this->DoProcessTag();
-		if ($o !== false)
-		{
-			$this->Parser->AppendOutput($o);
-		}
-		else
-		{
-			trigger_error('can\'t process tag '.$this->Tag.' in '.$this->Prefix,E_USER_WARNING);
-		}
-	}
-
-	function GetCode($echo=false)
-	{
-		$tmp_params = $this->NamedParams;
-		$splited = split("[ \t\n]{1}", $this->OriginalTagData, 2);
-		if (isset($splited[1]) && $splited[1]) {
-			$this->ParseNamedParams($splited[1]);
-		}
-		$pass_params = $this->NamedParams;
-		$this->NamedParams = $tmp_params;
-
-		$code = Array();
-
-		$to_pass = 'Array(';
-		foreach ($pass_params as $name => $val) {
-			$to_pass .= '"'.$name.'" => "'.str_replace('"', '\"', $val).'",';
-		}
-		$to_pass .= ')';
-
-		if ($echo) $code[] = '$o = '."'';\n";
-
-		switch ( strtolower($this->Tag) ) {
-			case 'defaultparam':
-				foreach ($this->NP as $key => $val)	{
-					$code[] = 'if (!isset($'.$key.')) $application->Parser->SetParam(\''.$key.'\', \''.$val.'\');';
-					$code[] = '$'.$key.' = isset($'.$key.') ? $'.$key.' : \''.$val.'\';';
-				}
-				return $code;
-			case 'param':
-			case 'Param':
-				$code[] = 'if (isset($application->LateParsed["'.$this->NP['name'].'"])) {';
-					$code[] = '$__f = $application->PreParsedBlocks[\'capture_'.$this->NP['name'].'\'];';
-					$code[] = '$application->Parser->SetParam(\''.$this->NP['name'].'\', $__f($params)'.');'; // array()
-					$code[] = '$'.$this->NP['name'].' = $application->Parser->GetParam(\''.$this->NP['name'].'\');';
-					$code[] = '$params[\''.$this->NP['name'].'\'] = $'.$this->NP['name'].';';
-				$code[] = '}';
-				$code[] = '$p =& $application->recallObject(\'m_TagProcessor\');';
-				$code[] = '$tag_params = '.$to_pass.';';
-				$param_code = '$o .= $p->PostProcess($params["'.$this->NP['name'].'"], $p->PreparePostProcess($tag_params))';
-				if (isset($this->NP['plus'])) {
-					$param_code .= ' + '.$this->NP['plus'];
-				}
-				$code[] = $param_code.';';
-				return $code;
-			case 'if':
-				if (isset($this->NP['_closing_tag_'])) {
-					$code[] = ' }';
-				}
-				else {
-					$check = isset($pass_params['check']) && $pass_params['check'] ? $pass_params['check'] : false; // $this->GetParam('check');
-					if ($check) {
-						if (strpos($check, '_') !== false) {
-							list($prefix, $function) = explode('_', $check, 2);
-						}
-						else {
-							$function = $check;
-							$prefix = '$PrefixSpecial'; // $this->Parser->GetParam('PrefixSpecial');
-						}
-					}
-					else {
-						$prefix = $pass_params['prefix']; // $this->GetParam('prefix');
-						$function = $pass_params['function']; // $this->GetParam('function');
-					}
-
-					$code[] = '$tmp = $application->processPrefix("'.$prefix.'");'."\n";
-					$code[] = '$__tp = $tmp[\'prefix\'].\'_TagProcessor\';'."\n";
-					$code[] = '$p =& $application->recallObject($__tp);'."\n";
-					$code[] = '$p->Prefix = $tmp[\'prefix\'];'."\n";
-					$code[] = '$p->Special = $tmp[\'special\'];'."\n";
-					$code[] = '$if_result = $p->ProcessParsedTag(\''.$function.'\', '.$to_pass.', "'.$prefix.'");'."\n";
-					if (isset($pass_params['inverse'])) {
-						$code[] = 'if (!$if_result) {';
-					}
-					else {
-						$code[] = 'if ($if_result) {';
-					}
-				}
-				return $code;
-
-			case 'endif':
-				$code[] = ' }';
-				return $code;
-
-			case 'else':
-				$code[] = ' }';
-				$code[] = ' else {';
-				return $code;
-		}
-
-		/* $tmp_pref = $this->getPrefixSpecial();
-		$tmp = $this->Application->processPrefix($tmp_pref);
-		$tmp_processor = $tmp['prefix'].'_TagProcessor';
-		if (strpos($tmp['prefix'], '$') !== false) {
-			$processor_to_check = '{'.$tmp['prefix'].'}_TagProcessor';
-		}
-		else {
-			$processor_to_check = $tmp_processor;
-		}  */
-
-		if (isset($this->NamedParams['_auto_prefix_'])) {
-			$prefix = '$PrefixSpecial';
-		}
-		else {
-			// use original prefix_special found in templates (parameter names in form $ParamName found in it will not be replaced with values)
-			list ($prefix, $tag) = explode(':', $splited[0], 2); //$prefix = $this->getPrefixSpecial();
-
-			if (isset($this->NamedParams['_ignore_missing_'])) {
-				if (!$this->Application->prefixRegistred($prefix)) return array();
-			}
-		}
-
-		$code[] = '$tmp = $application->processPrefix("'.$prefix.'");'."\n";
-
-		/*if (!isset($this->Application->CompilationCache[$this->getPrefixSpecial()])) {
-			$code[] = '$tmp = $application->processPrefix("'.$this->getPrefixSpecial().'");'."\n";
-			$code[] = '$__tp = $tmp[\'prefix\'].\'_TagProcessor\';'."\n";
-			$code[] = '$application->CachedProcessors["'.$this->getPrefixSpecial().'"] =& $application->recallObject($__tp);'."\n";
-			$this->Application->CompilationCache[$this->getPrefixSpecial()] = true;
-
-			if (strpos($tmp_pref, '$') === false) {
-				$this->Application->CachedProcessors[$this->getPrefixSpecial()] =& $this->Application->recallObject($tmp_processor);
-			}
-		}
-
-		$this->Parser->UsedProcessors[] = $tmp['prefix'];*/
-		$code[] = '$__tp = $tmp[\'prefix\'].\'_TagProcessor\';'."\n";
-		$code[] = '$p =& $application->recallObject($__tp);'."\n";
-		$code[] = '$p->Prefix = $tmp[\'prefix\'];'."\n";
-		$code[] = '$p->Special = $tmp[\'special\'];'."\n";
-
-		$tag_func = $this->Tag;
-		if ($tag_func == 'include') $tag_func = 'MyInclude';
-
-//		$code[] = '$o .= $application->CachedProcessors["'.$this->getPrefixSpecial().'"]->ProcessParsedTag(\''.$tag_func.'\', '.$to_pass.', "'.$this->Processor.'");'."\n";
-
-		$code[] = '$o .= $p->ProcessParsedTag(\''.$tag_func.'\', '.$to_pass.', "'.$prefix.'");'."\n"; // $this->Processor
-
-		/*$code = '	$processor =& $application->recallObject(\''.$this->Processor.'_TagProcessor\');
-				 	$o .= $processor->ProcessParsedTag(\''.$this->Tag.'\', unserialize(\''.serialize($this->NP).'\'));';*/
-
-		if (isset($pass_params['result_to_var'])) {
-			$code[] = '$'.$pass_params['result_to_var'].' = $application->Parser->GetParam(\''.$pass_params['result_to_var'].'\');';
-			$code[] = '$params[\''.$pass_params['result_to_var'].'\'] = $'.$pass_params['result_to_var'].';';
-			$echo = false;
-		}
-
-		if ($echo) $code[] = ' echo $o;'."\n";
-
-		return $code;
-		//return '$o .= \'tag:'. $this->Tag .'\'';
-	}
-}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/kernel/parser/template.php
===================================================================
diff -u -N
--- branches/5.1.x/core/kernel/parser/template.php	(revision 12127)
+++ branches/5.1.x/core/kernel/parser/template.php	(revision 0)
@@ -1,298 +0,0 @@
-<?php
-/**
-* @version	$Id: template.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-class Template {
-	var $Body = '';
-	var $BasePath = '';
-	var $Filename = '';
-
-	function Template($base_path=null, $filename=null, $silent=0)
-	{
-		if ($this->SetBasePath($base_path)) {
-			if (isset($filename)) {
-				$this->Filename = $filename;
-				$this->LoadTemplate($silent);
-			}
-		}
-	}
-
-	function SetBasePath($base_path=null)
-	{
-		if (isset($base_path)) {
-			$base_path = eregi_replace("/$", '', $base_path); //Cutting possible last slash
-			$this->BasePath = $base_path;
-			return true;
-		}
-		return false;
-	}
-
-	function GetFullPath()
-	{
-		return $this->BasePath.'/'.ltrim($this->Filename, '/').'.tpl';
-	}
-
-	/**
-	 * Enter description here...
-	 *
-	 * @param int $silent template not found {0 - fatal error, 1 - warning, 2 - nothing}
-	 * @return bool
-	 */
-	function LoadTemplate($silent = 0)
-	{
-		$filename = $this->GetFullPath();
-		if (file_exists($filename)) {
-			if (filesize ($filename)  == 0) {
-				trigger_error("Template file size is 0: <b>$filename</b>", ($silent ? E_USER_NOTICE : E_USER_ERROR) );
-			}
-
-			// stripping out special comments
-			$this->SetBody(preg_replace('/<!--##.*##-->/sU', '', file_get_contents($filename)));
-			/*$handle = fopen ($filename, "r");
-			$contents = fread ($handle, filesize ($filename));
-			$this->SetBody($contents);
-			fclose ($handle);*/
-			return true;
-		}
-		else {
-			if (($silent != 2) && !$silent) {
-				$application =& kApplication::Instance();
-				if ($application->isDebugMode()) {
-					$application->Debugger->appendTrace();
-				}
-				trigger_error('File or block not found: <b>'.$filename.'</b> at '.$application->Parser->TemplateName, E_USER_ERROR);
-			}
-			return false;
-		}
-	}
-
-	function SetBody($body)
-	{
-		$this->Body = $body;
-	}
-
-	function GetBody()
-	{
-		return $this->Body;
-	}
-}
-
-class TemplatesCache extends kBase {
-	var $Templates = Array();
-	var $BasePath;
-	var $FileNames = Array();
-
-	/**
-	 * Force templates cache to search templates on front-end:
-	 * true - search for theme name in template name
-	 * false - don't search anywhere
-	 * name - theme name to prepend for each template name
-	 *
-	 * @var mixed
-	 */
-	var $forceThemeName = false;
-
-	function TemplatesCache()
-	{
-		parent::kBase();
-		$this->BasePath = FULL_PATH.THEMES_PATH;
-
-		$conn =& $this->Application->GetADODBConnection();
-	}
-
-	/**
-	 * Based on template name gets it's location on disk and owner module
-	 *
-	 * @param string $filename
-	 * @return Array 0 - path on disk, 1 - template name
-	 */
-	function GetTemplatePaths($filename)
-	{
-		if ($this->Application->IsAdmin() && isset($this->Application->ReplacementTemplates[$filename])) {
-			$filename = $this->Application->ReplacementTemplates[$filename];
-		}
-
-		// allows to use non-replaced version of replaced template
-		$filename = preg_replace('/^original:(.*)/', '\\1', $filename);
-
-		if (preg_match('#^[\/]{0,1}([^\/]*)\/(.*)#', $filename, $regs)) {
-			$module_filename = $regs[2];
-			$first_dir = $regs[1];
-		}
-		else {
-			$first_dir = '';
-			$module_filename = $filename;
-		}
-
-		if (is_string($this->forceThemeName)) {
-			// when defined, then all templates are read from given theme name
-			$first_dir = 'theme:' . $this->forceThemeName . ($first_dir ? '/' . $first_dir : '');
-		}
-
-		// !preg_match for backward compatability with full-path plugins
-		if ($this->Application->IsAdmin() && $first_dir == 'plugins' && !preg_match('/admin_templates/', $module_filename)) {
-			if (preg_match('#^[\/]{0,1}([^\/]*)\/(.*)#', $module_filename, $regs)) {;
-				$path = MODULES_PATH.'/'.mb_strtolower($first_dir).'/'.$regs[1].'/admin_templates';
-				$module_filename = $regs[2];
-			}
-			else {
-				$first_dir = '';
-				$module_filename = $filename;
-			}
-		}
-		elseif ( $this->Application->IsAdmin() && $this->Application->findModule('Name', $first_dir)) {
-			if ($first_dir == 'in-portal') {
-				$first_dir = 'kernel';
-			}
-			$path = MODULES_PATH.'/'.mb_strtolower($first_dir).'/admin_templates';
-		}
-		elseif ($this->forceThemeName && preg_match('/^theme:(.*)/', $first_dir, $regs)) {
-			// ability to use Front-End templates in admin (only during mass compilation)
-			$path = FULL_PATH . '/themes/' . $regs[1];
-		}
-		else {
-			$path = $this->BasePath;
-			$module_filename = $first_dir.'/'.$module_filename;
-		}
-
-		return Array ($path, $module_filename);
-	}
-
-	function LoadTemplate($filename, $title=NULL, $silent=0)
-	{
-		list ($path, $module_filename) = $this->GetTemplatePaths($filename);
-
-		$template = new Template($path, $module_filename, $silent);
-		if (!isset($title)) $title = $filename;
-		$this->SetTemplate($title, $template);
-	}
-
-	function GetRealFilename($filename)
-	{
-		list ($path, $module_filename) = $this->GetTemplatePaths($filename);
-		return $path.'/'.trim($module_filename, '/');
-	}
-
-	function SetTemplate($title, &$template, $filename=null)
-	{
-		if (!isset($filename)) $filename=$title;
-		$this->Templates[$title] = $template;
-		$this->FileNames[$title] = $filename;
-	}
-
-	function &GetTemplate($title, $silent=0)
-	{
-		if (!isset($this->Templates[$title])) {
-			$this->LoadTemplate($title, null, $silent);
-		}
-		return $this->Templates[$title];
-	}
-
-	function GetTemplateBody($title, $silent=0)
-	{
-		$template =& $this->GetTemplate($title, $silent);
-		if ( !is_object($template) ) {
-			return '';
-		}
-		return $template->GetBody();
-	}
-
-	function GetTemplateFileName($title)
-	{
-		return getArrayValue($this->FileNames, $title);
-	}
-
-	function SetTemplateBody($title, $body)
-	{
-		$template = new Template();
-		$template->SetBody($body);
-		$this->SetTemplate($title, $template);
-	}
-
-	function ParseTemplate($template_name)
-	{
-		$Parser = new TemplateParser($this->Application);
-		return $Parser->Parse( $this->GetTemplateBody($template_name) );
-	}
-
-	function TemplateExists($filename)
-	{
-		$real_file = $this->GetRealFilename( strtolower($filename) );
-		if (!preg_match('/\.tpl$/', $real_file)) {
-			$real_file .= '.tpl';
-		}
-		return file_exists($real_file);
-	}
-
-
-	function GetPreParsed($template)
-	{
-		$real_name = $this->GetRealFilename($template);
-		$fname = $real_name.'.php';
-		$fname = str_replace(FULL_PATH, defined('WRITEABLE') ? WRITEABLE.'/cache' : FULL_PATH.'/kernel/cache', $fname);
-
-		$tname = $real_name.'.tpl';
-		if (!file_exists($tname)) {
-			return false;
-		}
-
-		if (defined('SAFE_MODE') && SAFE_MODE) {
-			$conn =& $this->Application->GetADODBConnection();
-			$cached = $conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'Cache WHERE VarName = "'.$fname.'"');
-			if ($cached !== false && $cached['Cached'] > filemtime($tname)) {
-				return array('active' => 1, 'fname' => $fname, 'tname' => $tname, 'mode' => 'db', 'content' => $cached['Data']);
-			}
-		}
-		else {
-			if (file_exists($fname) && file_exists($tname) && filemtime($fname) > filemtime($tname)) {
-				return array('active' => 1, 'fname' => $fname, 'tname' => $tname, 'mode' => 'file');
-			}
-			if (!file_exists($fname)) {
-				 // make sure to create directory if pre-parsed file does not exist
-				$this->CheckDir(dirname($fname), defined('WRITEABLE') ? WRITEABLE.'/cache' : FULL_PATH.'/kernel/cache');
-			}
-		}
-		return array('active' => 0, 'fname' => $fname, 'tname' => $tname, 'mode'=>'file');
-	}
-
-	/**
-	 * Recursive mkdir
-	 *
-	 * @param string $dir
-	 * @param string $base_path base path to directory where folders should be created in
-	 */
-	function CheckDir($dir, $base_path = '')
-	{
-		if (file_exists($dir)) {
-			return;
-		}
-		else {
-			// remove $base_path from beggining because it is already created during install
-			$dir = preg_replace('/^'.preg_quote($base_path.'/', '/').'/', '', $dir, 1);
-			$segments = explode('/', $dir);
-			$cur_path = $base_path;
-
-			foreach ($segments as $segment) {
-				// do not add leading / for windows paths (c:\...)
-				$cur_path .= preg_match('/^[a-zA-Z]{1}:/', $segment) ? $segment : '/'.$segment;
-				if (!file_exists($cur_path)) {
-					mkdir($cur_path);
-				}
-			}
-		}
-	}
-
-}
-
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/kernel/parser/construct_tags.php
===================================================================
diff -u -N
--- branches/5.1.x/core/kernel/parser/construct_tags.php	(revision 12127)
+++ branches/5.1.x/core/kernel/parser/construct_tags.php	(revision 0)
@@ -1,392 +0,0 @@
-<?php
-/**
-* @version	$Id: construct_tags.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-define('CM_PARSE', 1);
-define('CM_LATE_PARSE', 2);
-
-//Template language contruct tags (if, block...) which has opening and ending
-class ConstructTag extends Tag {
-	var $StopTag = '';
-	var $SkipMode = 0;
-	var $Logic = 0;
-
-
-	function SetStopTag($tag)
-	{
-		$this->StopTag = $tag;
-	}
-
-	function StoreSkipMode()
-	{
-		$this->SkipMode = $this->Parser->SkipMode;
-	}
-
-	function RestoreSkipMode()
-	{
-		$this->Parser->SetSkipMode($this->SkipMode);
-	}
-
-	function RestoreThisLevelSkipMode()
-	{
-		$this->SkipMode = $this->Parser->Recursion[$this->Parser->RecursionIndex]->SkipMode;
-	}
-
-	function SuggestSkipMode($mode)
-	{
-		if ($mode >= 1) //if we need to skip - always forcing it
-			$this->Parser->SetSkipMode($mode);
-		else { //if we need to turn of skipping
-			if ($this->SkipMode == parse) //check if initially skipping was off
-				$this->Parser->SetSkipMode(parse); //set it to off only then
-		}
-	}
-
-	function GetLogic()
-	{
-		if ($this->Parser->SkipMode != parse) {
-			$this->Logic = false;
-			return;
-		}
-		$check = $this->GetParam('check');
-		if ($check) {
-			if (strpos($check, '_') !== false) {
-				list($prefix, $function) = explode('_', $check, 2);
-			}
-			else {
-				$function = $check;
-				$prefix = $this->Parser->GetParam('PrefixSpecial');
-			}
-		}
-		else {
-			$prefix = $this->GetParam('prefix');
-			$function = $this->GetParam('function');
-		}
-		$this->NP['prefix'] = $prefix;
-		$this->NP['function'] = $function;
-
-		$inverse = $this->GetParam('inverse');
-
-		if ($prefix !== false) {
-			$tag =& new Tag('', $this->Parser);
-			$tag->Tag = $function;
-
-			$tmp = $this->Application->processPrefix($prefix);
-			$tag->Processor = $tmp['prefix'];
-
-			$tag->Prefix=$tmp['prefix'];
-			$tag->Special=$tmp['special'];
-			$tag->NamedParams = $this->NP;
-			$this->Logic = $tag->DoProcessTag();
-			// echo " this->Logic : ".$this->Logic."<br>";
-		}
-		else
-		{
-			$this->Logic = $function;
-		}
-		if($inverse) $this->Logic = !$this->Logic;
-	}
-
-	function Process()
-	{
-		switch ($this->Tag) {
-			case 'if':
-			case 'ifnot':
-				$this->GetLogic();
-
-				$this->SetStopTag('endif'); //This recursion level should end when 'endif' is found
-				$this->Parser->Recurve($this); //Saving current tag in parser recursion array
-				$this->StoreSkipMode(); //Storing initial SkipMode
-
-				if ($this->Logic) {
-					$this->SuggestSkipMode(parse); //suggest we parse it
-				}
-				else {
-					$this->SuggestSkipMode(skip); //suggest we don't parse it
-				}
-				break;
-			case 'elseif':
-				$if_logic = $this->Parser->Recursion[$this->Parser->RecursionIndex]->Logic;
-				if (!$if_logic) { //if IF or ELSEIF above have not worked
-					$this->GetLogic();
-
-					if ($this->Logic) { //ELSEIF should run
-						$this->Parser->Recursion[$this->Parser->RecursionIndex]->Logic = $this->Logic; //To escape running ELSE or ELSEIF below
-						$this->SuggestSkipMode(parse);
-					}
-					else { //ELSEIF should NOT run
-						$this->SuggestSkipMode(skip);
-					}
-				}
-				else //IF or ELSEIF above HAVE worked - this ELSEIF should NOT run
-					$this->SuggestSkipMode(skip);
-				break;
-			case 'else':
-				$if_logic = $this->Parser->Recursion[$this->Parser->RecursionIndex]->Logic;
-				$this->RestoreThisLevelSkipMode();
-				if (!$if_logic) { //IF was false - ELSE should run
-					$this->SuggestSkipMode(parse);
-				}
-				else { //IF was true - ELSE should not run
-					$this->SuggestSkipMode(skip);
-				}
-				break;
-		}
-	}
-
-	function CheckRecursion(&$tag)
-	{
-		if ($this->CheckEndRecursion($tag)) {
-			if (defined('EXPERIMENTAL_PRE_PARSE')) {
-				if ($tag->Tag == 'if' || $tag->Tag == 'endif') {
-					$this->Parser->AppendCompiledCode('}');
-					$this->Parser->ResetCode();
-				}
-			}
-			$this->RestoreSkipMode(); //Restoring original SkipMode
-			return true;
-		}
-		else {
-			if (defined('EXPERIMENTAL_PRE_PARSE')) {
-				//  && ($tag->Tag != 'RenderElement' && isset($tag->NP['_short_closing_']))
-				if ($tag->Tag != 'block' && $tag->Tag != 'DefineElement' && $tag->Tag != 'Capture' && !($tag->Tag == 'RenderElement' && isset($tag->NP['_short_closing_']))) {
-					$this->Parser->AppendCode($tag->GetCode());
-				}
-//				$this->Parser->AppendCompiledCode( $tag->GetCode() );
-			}
-		}
-		return false;
-	}
-
-	function CheckEndRecursion(&$tag)
-	{
-		if ($tag->GetParam('_closing_tag_') == 1 && $tag->Tag == $this->Tag) {
-			return true;
-		}
-		return ($tag->Tag == $this->StopTag); //Tag matches StopTag we are waiting for to close current recursion
-	}
-}
-
-class BlockTag extends ConstructTag {
-	var $BlockName = '';
-	var $InsideBlock = 0;
-
-	function Process()
-	{
-		switch ($this->Tag) {
-			case 'block':
-			case 'DefineElement':
-			case 'RenderElement':
-				if ($this->Tag == 'DefineElement') {
-					$this->SetStopTag('end_define'); //This recursion level should end when 'blockend' is found
-				}
-				else {
-					$this->SetStopTag('blockend'); //This recursion level should end when 'blockend' is found
-				}
-				if ($this->Tag == 'RenderElement') {
-					$this->NP['name'] = '__lambda_element_'.abs(crc32($this->TemplateName)).'_'.$this->Application->LambdaElements++;
-					$RenderTag = new Tag($this->TagData.' name="'.$this->NP['name'].'"', $this->Parser);
-					$this->Parser->AppendCode($RenderTag->GetCode());
-				}
-				$this->Parser->Recurve($this); //Saving current tag in parser recursion array
-				$this->Parser->SetBuffer('');
-				$this->BlockName = $this->NP['name']; //Stroing BlockName
-				if (isset($this->NP['args']) ) {
-					$this->Parser->Args = explode(',', $this->NP['args']);
-				}
-				$this->StoreSkipMode();
-				$this->SuggestSkipMode(skip_tags); //We need to skip tags from now
-				break;
-		}
-	}
-
-	function CheckRecursion(&$tag)
-	{
-		if (parent::CheckRecursion($tag)) { //if endtag matches (SkipMode would be restored then)
-			//Creating template from buffer
-
-			//if (defined('EXPERIMENTAL_PRE_PARSE') && isset($this->Application->PreParsedBlocks[$this->BlockName])) return true;
-
-			$template = new Template();
-			$template->SetBody($this->Parser->GetBuffer());
-
-			//Adding template to application' cache
-			$this->Application->TemplatesCache->SetTemplate($this->BlockName, $template, $this->Parser->TemplateName);
-
-			if (defined('EXPERIMENTAL_PRE_PARSE')) {
-				$code = $this->Parser->GetCode();
-
-				/*if ($this->Parser->UsedProcessors) {
-					array_unshift($code, '$application->CheckProcessors(array("'.implode('", "', $this->Parser->UsedProcessors).'"));');
-				}
-				$this->Parser->UsedProcessors = null;*/
-
-				// because of unshift the code is added from bottom to top here, so read from the bottom below:
-				array_unshift($code, '$o = \'\';');
-				array_unshift($code, '$application->Parser->SetParams($params, false);');
-				array_unshift($code, '$application =& kApplication::Instance();');
-				array_unshift($code, 'extract($params);');
-
-				$defaults = '$defaults = Array(';
-				foreach ($this->NP as $name => $val) {
-					if ($name == 'name') continue;
-					$defaults .= '"'.$name.'" => "'.str_replace('"', '\"', $val).'",';
-				}
-				$defaults .= ');';
-				array_unshift($code, '$params = array_merge_recursive2($defaults, $params);');
-				array_unshift($code, $defaults);
-
-				// ^^^^ read up from here ^^^^
-				$code[] = 'return $o;';
-
-				global $debugger;
-
-				$dbg_functions = $this->Application->isDebugMode() && constOn('DBG_PRINT_PREPARSED');
-
-				$f_body = '';
-				//echo "<pre>";
-				$l = 0;
-				if ($dbg_functions) echo "<b>function ".$this->BlockName." {</b><br>";
-				foreach ($code as $line) {
-					$l++;
-					if ($dbg_functions) {
-						echo $l.' '.$debugger->highlightString(trim($line)."\n", true);
-					}
-					$f_body .= "\t\t".rtrim($line, "\n")."\n";
-				}
-				if ($dbg_functions) echo "<b>} // function ".$this->BlockName." end</b><br><br>";
-				//echo "</pre>";
-
-				//caching func body
-				$this->Application->PreParsedCache[$this->BlockName] = $f_body;
-
-				$compile_body = preg_replace('/\/\*COMPILE-ONLY\*\/.*/m', '', $f_body);
-
-				$func = create_function('$params', $compile_body);
-				$this->Application->PreParsedBlocks[$this->BlockName] = $func;
-				$this->Parser->Args = null;
-				$this->Parser->ResetCode();
-
-				$real_name = $this->Parser->AppendCompiledFunction($this->BlockName, $f_body);
-
-				if ($this->Tag == 'RenderElement') {
-					$RenderTag = new Tag($this->TagData.' name="'.$this->BlockName.'"', $this->Parser);
-//					$this->Parser->AppendCompiledCode($RenderTag->GetCode());
-
-					// for compilation run
-					$RenderTag->Process();
-				}
-
-			}
-			return true;
-		}
-		else {
-			// append the tag itself to the block - while in block, we check every tag to be 'blockend'
-			// if it is not - we need to append the tag to the buffer, which we'll parse later in 'parse_block'
-			//if ($tag->Tag != 'block') {
-				if (defined('EXPERIMENTAL_PRE_PARSE') && isset($this->Application->PreParsedBlocks[$this->BlockName])) {
-					return;
-				}
-				if (defined('EXPERIMENTAL_PRE_PARSE')) {
-				//	$this->Parser->AppendCode($tag->GetCode());
-				}
-				else {
-					$this->Parser->AppendOutput($tag->GetFullTag());
-				}
-			//}
-			return false;
-		}
-	}
-}
-
-class CaptureTag extends ConstructTag {
-	var $VarName = null;
-	var $Mode = CM_LATE_PARSE;
-
-	function Process()
-	{
-		switch ($this->Tag) {
-			case 'Capture':
-				$this->Parser->Recurve($this); //Saving current tag in parser recursion array
-				$this->Parser->SetBuffer('');
-				$this->VarName = $this->NP['to_var']; //Stroing BlockName
-				$this->StoreSkipMode();
-
-				if (isset($this->NP['mode']) && $this->NP['mode'] == 'parse_now') {
-					$this->Mode = CM_PARSE;
-				}
-				$this->SuggestSkipMode(skip_tags);
-				break;
-		}
-	}
-
-	function RunCapture($f, $func, $cur_lambda)
-	{
-		$code = array();
-		$code[] = '/*COMPILE-ONLY*/ '.$f[2];
-		$code[] = '/*LAMBDA-ONLY*/ $application->PreParsedBlocks[\'capture_'.$this->VarName.'\'] = $application->PreParsedBlocks[\'capture_'.$this->VarName.$cur_lambda.'\'];';
-		$code[] = '$__f = $application->PreParsedBlocks[\'capture_'.$this->VarName.'\'];';
-		$code[] = '$application->Parser->SetParam(\''.$this->VarName.'\', $__f(array())'.');';
-		$code[] = '$'.$this->VarName.' = $application->Parser->GetParam(\''.$this->VarName.'\');';
-		$code[] = '$params[\''.$this->VarName.'\'] = $'.$this->VarName.';';
-		if ($this->Parser->RecursionIndex > 1) {
-			$this->Parser->AppendCode($code, -1);
-		}
-		else {
-			$this->Application->Parser->SetParam($this->VarName, $func(array()));
-			$this->Parser->AppendCompiledCode($code);
-		}
-	}
-
-	function CheckRecursion(&$tag)
-	{
-		if (parent::CheckRecursion($tag)) { //if endtag matches (SkipMode would be restored then)
-			$f_code = $this->Parser->GetCode();
-			array_unshift($f_code, '$o = \'\';');
-			array_unshift($f_code, '$application =& kApplication::Instance();');
-			$f_code[] = 'return $o;';
-
-			$f = $this->Parser->PrepareCompiledFunction('capture_'.$this->VarName, $f_code, false);
-			$f_code = trim(join("\n\t", $f_code));
-			$func = create_function('$params', $f_code);
-			$this->Application->PreParsedBlocks['capture_'.$this->VarName] = $func;
-			$cur_lambda = $this->Application->LambdaElements++;
-			$this->Application->PreParsedBlocks['capture_'.$this->VarName.$cur_lambda] = $func;
-
-			$this->Parser->AppendCompiledCode($f[1]);
-
-			if ($this->Mode == CM_PARSE) {
-				$this->RunCapture($f, $func, $cur_lambda);
-			}
-			elseif ($this->Mode == CM_LATE_PARSE) {
-				$code = array();
-				$code[] = '/*COMPILE-ONLY*/ '.$f[2];
-				$code[] = '/*LAMBDA-ONLY*/ $application->PreParsedBlocks[\'capture_'.$this->VarName.'\'] = $application->PreParsedBlocks[\'capture_'.$this->VarName.$cur_lambda.'\'];';
-				$code[] = '$application->LateParsed[\''.$this->VarName.'\'] = '.$cur_lambda.';';
-				if ($this->Parser->RecursionIndex > 1) {
-					$this->Parser->AppendCode($code, -1);
-				}
-				else {
-					$this->Parser->AppendCompiledCode($code);
-				}
-				$this->Application->LateParsed[$this->VarName] = $cur_lambda;
-			}
-			$this->Parser->ResetCode();
-			return true;
-		}
-		return ($tag->Tag == $this->StopTag); //Tag matches StopTag we are waiting for to close current recursion
-	}
-
-}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/units/pdf/pdf_renderer.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/pdf/pdf_renderer.php	(.../pdf_renderer.php)	(revision 12127)
+++ branches/5.1.x/core/units/pdf/pdf_renderer.php	(.../pdf_renderer.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pdf_renderer.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: pdf_renderer.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,28 +12,31 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class kPDFRenderer {
+
 	const SHAPE_DRAW_FILL =  1;
 	const SHAPE_DRAW_FILL_AND_STROKE = 2;
 	const SHAPE_DRAW_STROKE = 0 ;
-	
+
 	function SetFont($font, $size) {}
-	
+
 	function SetFillColor($color) {}
-	
+
 	function SetLineColor($color) {}
-	
+
 	function SetLineWith($width) {}
-	
+
 	function DrawLine($x1, $y1, $x2, $y2) {}
-	
+
 	function DrawRectangle($x1, $y1, $x2, $y2, $mode) {}
-	
+
 	function DrawText($x, $y, $text) {}
-	
+
 	function GetPDFString() {}
-	
+
 	function GetAscent() {}
-	
+
 	function GetDescent() {}
 }
Index: branches/5.1.x/themes/default2009/platform/login/register.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/login/register.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/login/register.tpl	(revision 0)
@@ -1,110 +0,0 @@
-<!--##
-<NAME>User Registration</NAME>
-<DESC></DESC>
-<SECTION>My Account||Login</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_UserRegistration"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration" templates="platform/login/register"/>
-		</div>
-		<div class="movable-element">
-			<!-- user registration -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_UserRegistration"/>
-				</inp2:m_Capture>
-
-				<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-				<inp2:u_PresetFormFields/>
-				<inp2:m_if check="u_HasError" field="any">
-					<inp2:m_RenderElement name="error_message" />
-				</inp2:m_if>
-
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-				<form method="post" action="<inp2:m_FormAction/>">
-					<table class="form-data fullwidth">
-						<inp2:m_if check="u_UseUsernames">
-							<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
-						</inp2:m_if>
-
-						<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
-							<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
-							<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
-						</inp2:m_if>
-
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
-
-						<inp2:m_if check="m_GetConfig" name="AllowSelectGroupOnFront">
-							<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="UserGroup" has_empty="1" title="lu_fld_UserGroup" />
-						</inp2:m_if>
-
-						<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
-
-						<inp2:m_if check="m_ConfigEquals" option="RegistrationCaptcha" value="1">
-							<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-							<inp2:m_RenderElement name="inp_edit_captcha" prefix="u" style="width: 170px;" />
-						</inp2:m_if>
-
-						<inp2:m_ModuleInclude template="elements/registration_fields.elm"/>
-
-						<inp2:m_RenderElement design="inp_edit_buttons">
-							<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
-							<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm" />
-							<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending" />
-
-							<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register"/>"/>
-							<input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase name="lu_btn_Cancel"/>"/>
-						</inp2:m_RenderElement>
-					</table>
-				</form>
-			</inp2:m_RenderElement>
-			<!-- // user registration -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/login/register_confirm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/login/register_confirm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/login/register_confirm.tpl	(revision 0)
@@ -1,60 +0,0 @@
-<!--##
-<NAME>Registration Completed</NAME>
-<DESC></DESC>
-<SECTION>My Account||Login</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_RegistrationConfirmation"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration,lu_title_RegistrationConfirmation" templates="platform/login/register,platform/login/register_confirm"/>
-		</div>
-		<div class="movable-element">
-			<!-- registration confirmation -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_RegistrationConfirmation"/>
-				</inp2:m_Capture>
-
-				<form method="POST" action="<inp2:m_FormAction />">
-					<inp2:m_phrase name="lu_RegistrationCompleted"/>
-
-					<inp2:m_if check="conf_ConfigValue" name="User_Password_Auto">
-						<br /><br /><inp2:m_phrase name="lu_RegistrationEmailed"/>
-					</inp2:m_if>
-
-					<br /><br />
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
-				</form>
-			</inp2:m_RenderElement>
-			<!-- // registration confirmation -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/inc/nlsmenuext_dyn.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/nlsmenuext_dyn.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/nlsmenuext_dyn.js	(revision 0)
@@ -1,153 +0,0 @@
-/**
-* nlsmenuext_dyn.js v.1.0
-* Copyright 2005-2007, addobject.com. All Rights Reserved
-* Author Jack Hermanto, www.addobject.com
-*/
-NLSMENU.setItemVisible=function(key, v) {
-  var it=this.getItemById(key);
-  var oIt=NlsMenu.$GE(it.intKey);
-  if(oIt) {
-    if (this.orient=="V") { oIt=oIt.parentNode; }
-    oIt.style.display=(v?"":"none");
-  }
-  nlsMenuMgr[this.mgrId].hideMenus();
-  var it=this.getItemById(key);
-  it.visible=v;
-};
-
-NLSMENU.setItemState=function(itId, s) {
-  var it=this.items[itId], lit=null;
-  if(it.group) {
-    for (var l in this.items) {
-      lit=this.items[l];
-      if(lit.group==it.group && lit.state==2) {
-        setMnStyle(NlsMenu.$GE(lit.intKey), (lit.enable ? "N" : "D"), NlsMenu.getPrf(lit, this));
-        setMnIcon(this, lit, "N");
-        lit.state=1;
-      }
-    }
-  }
-  var oIt=NlsMenu.$GE(itId);
-  setMnStyle(oIt, (it.enable ? (s==1?"N":"S") : "D"), NlsMenu.getPrf(it, this));
-  setMnIcon(this, it, "N");
-  it.state=s;
-};
-
-NLSMENU.setSelection=function(itId, s) {
-  var prf="";
-  var it=this.items[this.rt.lastSel];
-  if(it){
-    prf=it.stlprf; if(prf=="")prf=this.stlprf;
-    setMnStyle(NlsMenu.$GE(it.intKey), (it.enable ?"N":"D"), prf);
-    setMnIcon(this, it, "N");
-    it.selected=false;
-  }
-
-  it=this.items[itId];
-  prf=it.stlprf; if(prf=="")prf=this.stlprf;
-  setMnStyle(NlsMenu.$GE(itId), (it.enable ?"S":"D"), prf);
-  setMnIcon(this, it, "O");
-  this.rt.lastSel=itId;
-  it.selected=true;
-};
-
-NlsMnMgr.savePath=function(vl) {
-  NlsMenuManager.$setCookie(this.mgrId+"_path", String(vl));
-};
-
-NlsMnMgr.loadPath=function() {
-  var p=NlsMenuManager.$getCookie(this.mgrId+"_path");
-  if(p && p!="") {
-    p=p.split("_");
-    this.selectPath(p[0], p[1]);
-  }
-
-}
-
-NlsMnMgr.selectPath=function(mId, id) {
-  this.unselectPath();
-  var mn=nlsMenu[mId], it=mn.items[mId+"_"+id],prf="",pr="";
-  while(mn && it) {
-    prf=it.stlprf; if(prf=="")prf=mn.stlprf;
-    setMnStyle(NlsMenu.$GE(it.intKey), (it.enable ?"S":"D"), prf);
-    setMnIcon(mn, it, "O");
-    mn.rt.lastSel=it.intKey;
-    it.selected=true;
-
-    pr=mn.prIt;
-    if(pr) {
-      mn=nlsMenu[pr.split("_")[0]];
-      it=mn.items[pr];
-    } else {mn=null; it=null}
-  }
-};
-
-NlsMnMgr.unselectPath=function() {
-  var mgr=this,prf="",it=null, mns=[mgr.menubar];
-  for(var i in mgr.menus) { mns[mns.length]=mgr.menus[i]; }
-  for(var i=0;i<mns.length;i++) {
-    for (var j in mns[i].items) {
-      it=mns[i].items[j];
-      if (it.selected) {
-        prf=it.stlprf; if(prf=="")prf=mns[i].stlprf;
-        setMnStyle(NlsMenu.$GE(it.intKey), (it.enable ?"N":"D"), prf);
-        setMnIcon(mns[i], it, "N");
-      }
-    }
-  }
-};
-
-NLSMENU.addToggleItem=function(key, grp, capt, url, ico, enb, xtra, title) {
-  var it=this.addItem(key, capt, url, ico, enb, xtra, null, title);
-  it.toggle=true;
-  it.group=grp;
-  return it;
-};
-
-NLSMENU.deleteItem = function(key) {
-  var intKey = this.mId+"_"+key;
-  if (!this.items[intKey]) return;
-
-  if(this.lsItm) {
-    var lsItm=this.items[this.lsItm.id];
-    if(lsItm.id==key) {this.lsItm=null; }
-  }
-
-  this.items[intKey] = null;
-  delete this.items[intKey];
-  var ovr=-1;
-  for (var i=0; i<this.srItems.length; i++) {
-    if (this.srItems[i].id==key) { ovr=i; }
-    if ( ovr!=-1 && i>=ovr && i<this.srItems.length) {
-      this.srItems[i]=this.srItems[i+1];
-    }
-  }
-  this.srItems.length--;
-};
-
-/*Cookie related*/
-NlsMenuManager.$setCookie=function(key, value, expire) {
-  if (value==null) return;
-  var v = value;
-  if (v!="") v=escape(v);
-  document.cookie = escape(key)+"="+ v + (expire?"; expires="+expire:"");
-};
-
-NlsMenuManager.$getCookie=function(key) {
-  if (document.cookie) {
-    var cp=document.cookie.split(";");
-    var c=null;
-    for (var i=0; i<cp.length; i++) {
-      c=cp[i].split("=");
-      if (unescape(c[0].replace(/\s*/gi,""))==key) { return (c.length>1?unescape(c[1]):""); }
-    }
-  }
-  return "";
-};
-
-NlsMenuManager.$removeCookie=function(key) {
-  NlsMenuManager.$setCookie(key, "-1", "Fri, 31 Dec 1999 23:59:59 GMT;");
-}
-
-
-
Index: branches/5.1.x/themes/default2009/platform/img/logo.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/starrating.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/pagenation_right.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/pixel_blue.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/icon_favorite.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/mp3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/my_account/my_profile.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/my_account/my_profile.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/my_account/my_profile.tpl	(revision 0)
@@ -1,81 +0,0 @@
-<!--##
-<NAME>My Profile</NAME>
-<DESC></DESC>
-<SECTION>My Account</SECTION>
-##-->
-
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_MyProfile"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyProfile" templates="platform/my_account/my_account,platform/my_account/my_profile"/>
-		</div>
-		<div class="movable-element">
-			<!-- my profile -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_MyProfile"/>
-				</inp2:m_Capture>
-
-				<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-				<inp2:m_if check="u_HasError" field="any">
-					<inp2:m_RenderElement name="error_message" />
-				</inp2:m_if>
-
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-				<form method="post" enctype="multipart/form-data" action="<inp2:m_FormAction/>">
-					<table class="form-data fullwidth">
-						<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="lu_fld_Login"/>
-
-						<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
-						<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" has_empty="1"/>
-						<inp2:m_RenderElement name="inp_edit_image_upload" prefix="u" field="PrimaryImage" title="lu_prompt_Avatar" is_last="1"/>
-
-						<inp2:m_RenderElement design="inp_edit_buttons">
-							<input class="button" type="submit" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
-							<input type="hidden" name="next_template" value="platform/my_account/my_account"/>
-						</inp2:m_RenderElement>
-					</table>
-				</form>
-			</inp2:m_RenderElement>
-			<!-- // my profile -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/phrases_edit.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/phrases_edit.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/phrases_edit.tpl	(revision 0)
@@ -1,73 +0,0 @@
-<!--##
-<NAME>Edit Phrases</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_MissingPhraseAdding"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MissingPhraseAdding" templates="phrases_edit"/>
-		</div>
-		<div class="movable-element">
-			<!-- ADD/EDIT PHRASE -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_MissingPhraseAdding"/>
-				</inp2:m_Capture>
-
-				<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-				<inp2:m_if check="phrases_HasError" field="any">
-					<inp2:m_RenderElement name="error_message" />
-				</inp2:m_if>
-
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-				<form method="post" action="<inp2:m_FormAction/>">
-					<table class="form-data fullwidth">
-						<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="lu_fld_primary_translation"/>
-						<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="lu_fld_phrase" style="width: 300px;"/>
-						<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Translation" title="lu_fld_translation" style="width: 300px;"/>
-						<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="lu_fld_module" is_last="1"/>
-
-						<inp2:m_RenderElement design="inp_edit_buttons" width="150">
-							<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get var="phrases_label"/>" />
-							<input type="hidden" name="<inp2:phrases_InputName field="LanguageId"/>" value="<inp2:phrases_Field name="LanguageId"/>" />
-							<input type="hidden" name="<inp2:phrases_InputName field="PhraseType"/>" value="0" />
-							<input class="button" type="submit" name="events[phrases][<inp2:phrases_SaveEvent/>]" value="<inp2:m_Phrase label="lu_btn_Create"/>"/>
-						</inp2:m_RenderElement>
-					</table>
-				</form>
-			</inp2:m_RenderElement>
-			<!-- //ADD/EDIT PHRASE -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/pdf.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/warning_icon.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/grey_pix.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/jquery/thickbox/thickbox.css
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/jquery/thickbox/thickbox.css	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/jquery/thickbox/thickbox.css	(revision 0)
@@ -1,164 +0,0 @@
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-*{padding: 0; margin: 0;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_window {
-	font: 12px Arial, Helvetica, sans-serif;
-	color: #333333;
-}
-
-#TB_secondLine {
-	font: 10px Arial, Helvetica, sans-serif;
-	color:#666666;
-}
-
-#TB_window a:link {color: #666666;}
-#TB_window a:visited {color: #666666;}
-#TB_window a:hover {color: #000;}
-#TB_window a:active {color: #666666;}
-#TB_window a:focus{color: #666666;}
-
-/* ----------------------------------------------------------------------------------------------------------------*/
-/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
-/* ----------------------------------------------------------------------------------------------------------------*/
-#TB_overlay {
-	position: fixed;
-	z-index:100;
-	top: 0px;
-	left: 0px;
-	height:100%;
-	width:100%;
-}
-
-.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
-.TB_overlayBG {
-	background-color:#000;
-	filter:alpha(opacity=75);
-	-moz-opacity: 0.75;
-	opacity: 0.75;
-}
-
-* html #TB_overlay { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_window {
-	position: fixed;
-	background: #ffffff;
-	z-index: 102;
-	color:#000000;
-	display:none;
-	border: 4px solid #525252;
-	text-align:left;
-	top:50%;
-	left:50%;
-}
-
-* html #TB_window { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_window img#TB_Image {
-	display:block;
-	margin: 15px 0 0 15px;
-	border-right: 1px solid #ccc;
-	border-bottom: 1px solid #ccc;
-	border-top: 1px solid #666;
-	border-left: 1px solid #666;
-}
-
-#TB_caption{
-	height:25px;
-	padding:7px 30px 10px 25px;
-	float:left;
-}
-
-#TB_closeWindow{
-	height:25px;
-	padding:11px 25px 10px 0;
-	float:right;
-}
-
-#TB_closeAjaxWindow{
-	padding:7px 10px 5px 0;
-	margin-bottom:1px;
-	text-align:right;
-	float:right;
-}
-
-#TB_ajaxWindowTitle{
-	float:left;
-	padding:7px 0 5px 10px;
-	margin-bottom:1px;
-	font-weight: bold;
-}
-
-#TB_title{
-	background-color:#e8e8e8;
-	height:27px;
-}
-
-#TB_ajaxContent{
-	clear:both;
-	padding:2px 15px 15px 15px;
-	overflow:auto;
-	text-align:left;
-	line-height:1.4em;
-}
-
-#TB_ajaxContent.TB_modal{
-	padding:15px;
-}
-
-#TB_ajaxContent p{
-	padding:5px 0px 5px 0px;
-}
-
-#TB_load{
-	position: fixed;
-	display:none;
-	height:13px;
-	width:208px;
-	z-index:103;
-	top: 50%;
-	left: 50%;
-	margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
-}
-
-* html #TB_load { /* ie6 hack */
-position: absolute;
-margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
-}
-
-#TB_HideSelect{
-	z-index:99;
-	position:fixed;
-	top: 0;
-	left: 0;
-	background-color:#fff;
-	border:none;
-	filter:alpha(opacity=0);
-	-moz-opacity: 0;
-	opacity: 0;
-	height:100%;
-	width:100%;
-}
-
-* html #TB_HideSelect { /* ie6 hack */
-     position: absolute;
-     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#TB_iframeContent{
-	clear:both;
-	border:none;
-	margin-bottom:-1px;
-	margin-top:1px;
-	_margin-bottom:1px;
-}
Index: branches/5.1.x/themes/default2009/platform/img/star_rate.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/gradient_background_red.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/ic_removefromfav.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/arrow_white.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/google_map_sample.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/directory_icon.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/menu_my_account.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/star.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/zoom.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/thankyou.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/thankyou.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/thankyou.tpl	(revision 0)
@@ -1,53 +0,0 @@
-<!--##
-<NAME>Thank You</NAME>
-<DESC>Thank you for submitting contact form</DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_Phrase source="get" name="thankyou_header" default="lu_title_Thankyou"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_Phrase source="get" name="thankyou_header" default="lu_title_Thankyou"/>
-				</inp2:m_Capture>
-
-				<inp2:m_Phrase source="get" name="thankyou_text" default="lu_text_Thankyou"/>
-
-				<br /><br />
-
-				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:c_CategoryLink template="__default__"/>'" />&nbsp;
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/menu_home.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/login/forgot_password_reset_notice.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/login/forgot_password_reset_notice.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/login/forgot_password_reset_notice.tpl	(revision 0)
@@ -1,60 +0,0 @@
-<!--##
-<NAME>Forgot Password Notification</NAME>
-<DESC>Password Sent Confirmation</DESC>
-<SECTION>My Account||Login</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ForgotPasswordNotification"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordNotification" templates="platform/login/forgot_password_reset_notice"/>
-		</div>
-		<div class="movable-element">
-			<!-- forgot password reset confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ForgotPasswordNotification"/>
-				</inp2:m_Capture>
-
-				<form method="POST" action="<inp2:m_FormAction />">
-					<inp2:m_Phrase label="lu_text_ForgotPassResetEmailSent"/>
-					<br /><br />
-
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" class="button" onclick="redirect('<inp2:m_Link template="index" />');"/>
-				</form>
-			</inp2:m_RenderElement>
-			<!-- // forgot password reset confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/header_arrow.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/icon_new.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/menu-li-2-level.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/nlsmenueffect.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/nlsmenueffect.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/nlsmenueffect.js	(revision 0)
@@ -1,241 +0,0 @@
-/**
-* nlsmenueffect.js v.2.0.1
-* Copyright 2005-2007, addobject.com. All Rights Reserved
-* Author Jack Hermanto, www.addobject.com
-*/
-var nlsEffectList={
-  barn:"progid:DXImageTransform.Microsoft.Barn(Duration=0.3,motion=out,orientation=vertical);",
-  blinds:"progid:DXImageTransform.Microsoft.Blinds(Duration=0.3,Bands=8,direction=right);",
-  checkerboard:"progid:DXImageTransform.Microsoft.Checkerboard(Duration=0.3,Direction=right,SquaresX=20,SquaresY=20);",
-  fade:"progid:DXImageTransform.Microsoft.Fade(Duration=0.3,Overlap=1.00);",
-  inset:"progid:DXImageTransform.Microsoft.Inset(Duration=0.3);",
-  iris:"progid:DXImageTransform.Microsoft.Iris(Duration=0.3,irisstyle=CIRCLE,motion=in);",
-  pixelate:"progid:DXImageTransform.Microsoft.Pixelate(Duration=0.3,MaxSquare=10);",
-  radialwipe:"progid:DXImageTransform.Microsoft.RadialWipe(Duration=0.3,wipestyle=WEDGE)",
-  randombars:"progid:DXImageTransform.Microsoft.RandomBars(Duration=0.3,Orientation=horizontal);",
-  randomdissolve:"progid:DXImageTransform.Microsoft.RandomDissolve(duration=0.3);",
-  slide:"progid:DXImageTransform.Microsoft.Slide(Duration=0.3,slidestyle=HIDE,Bands=5);",
-  spiral:"progid:DXImageTransform.Microsoft.Spiral(Duration=0.3,GridSizeX=64,GridSizeY=64);",
-  stretch:"progid:DXImageTransform.Microsoft.Stretch(Duration=0.3,stretchstyle=HIDE);",
-  strips:"progid:DXImageTransform.Microsoft.Strips(Duration=0.3,motion=rightdown);",
-  wheel:"progid:DXImageTransform.Microsoft.Wheel(Duration=0.3,spokes=10);",
-  gradienwipe:"progid:DXImageTransform.Microsoft.GradientWipe(Duration=0.3,GradientSize=0.75,wipestyle=0,motion=forward);",
-  zigzag:"progid:DXImageTransform.Microsoft.Zigzag(Duration=0.3,GridSizeX=8,GridSizeY=8);",
-  itemfade:"progid:DXImageTransform.Microsoft.Fade(Duration=0.2,Overlap=0.75);",
-  itemdissolve:"progid:DXImageTransform.Microsoft.RandomDissolve(duration=0.3);",
-  aoslide:"Duration:2"
-};
-
-function NlsMenuEffect(mId, effName) {
-  this.mId=mId;
-  this.elm=null;
-  this.effName=effName;
-  this.isOut=false;  
-  this.prop=new Object();
-  this.onShow=function() {};
-  this.onHide=function() {};
-  
-  this.start=_defStart;
-  this.run=_defRun;
-  
-  if (effName=="aoslide") {
-    this.start=_slideStart;
-    this.run=_slideRun;
-  }
-  return this;
-};
-
-/*default effect*/
-var _fadeTm=null;
-var _fadesEff=new Object();
-
-function _defStart(isOut) {
-  var mn=NlsMenu.$GE(this.mId);  
-  mn.childNodes[0].style.position="";
-  nlsMenu[this.mId].rt.ready=true;
-  this.elm=NlsMenu.$GE("effwin_"+this.mId); 
-  if (nls_isIE) {
-    this.elm.style.filter=nlsEffectList[this.effName];
-    if (this.elm.filters.length>0) this.elm.filters[0].apply();
-  } else {
-    this.elm=this.elm.parentNode;    
-    this.isOut=(isOut==true);
-    if (!this.prop["init"]) {
-      this.elm.style.MozOpacity=(isOut?1:0);
-      this.elm.style.opacity=(isOut?1:0);
-    }
-    this.prop["init"]=true;
-    this.prop["dur"]=20;
-    this.prop["rng"]=100;
-    this.prop["spd"]=20;
-  }
-};
-
-function _defRun() {
-  if (nls_isIE) {
-    if (this.elm.filters.length>0) this.elm.filters[0].play();
-  } else {
-    var me=this;
-    if (this.elm.style.MozOpacity) this.prop["opa"]="MozOpacity"; else this.prop["opa"]="opacity";
-    var p=new Object();
-    p.x1=this.elm.style[this.prop["opa"]]*this.prop["rng"];
-    if (this.isOut) { p.x2=0; } else { p.x2=this.prop["rng"]-1; }
-    _fc_fade(p);
-    this.prop["pt"]=p;
-    this.prop["sd"]=0;
-    
-    _fadesEff[this.mId]=this;
-    if (!_fadeTm) _fadeTm=setInterval(function() {_fadeAnimate();}, this.prop["spd"]);    
-  }
-};
-
-function _fadeAnimate() {
-  var b=true;
-  for (var it in _fadesEff) {
-    var eff=_fadesEff[it]; 
-    var p=eff.prop["pt"];
-    if (eff.prop["sd"]<eff.prop["dur"]) {
-      eff.prop["sd"]++;
-      eff.elm.style[eff.prop["opa"]]=effect_bezier(eff.prop["sd"]/eff.prop["dur"],p.x1, p.x2, p.c1, p.c2)/eff.prop["rng"];
-    } else {
-      eff.elm.style[eff.prop["opa"]]=p.x2/eff.prop["rng"];
-      if (eff.isOut) {eff.onHide(); eff.elm.style[eff.prop["opa"]]=0;} else {eff.onShow();}
-      delete _fadesEff[eff.mId];
-    }
-    b=false;
-  }
-  if (b) {clearInterval(_fadeTm); _fadeTm=null;}
-};
-
-/*end*/
-
-/*slide effect*/
-var _slideTm=null;
-var _slidesEff=new Object();
-
-function _slideStart(isOut) {
-  var mn=NlsMenu.$GE(this.mId);
-  this.elm=mn.childNodes[0];
-  
-  if (!isOut && this.prop["init"]!=true) {
-    this.elm.style.position="";
-    var w=this.elm.offsetWidth; var h=this.elm.offsetHeight;
-    with (mn.style) { overflow="hidden"; width=w+"px"; height=h+"px";};
-
-    with (this.elm.style) {
-      position=nls_isIE?"absolute":"relative";
-      switch(this.prop["dir"]) {
-        case "right": top="0px";left=-w+"px"; this.prop["st"]="left"; break;
-        case "left": top="0px";left=w+"px"; this.prop["st"]="left"; break;
-        case "down": top=-h+"px";left="0px"; this.prop["st"]="top"; break;
-        case "up": top=h+"px";left="0px"; this.prop["st"]="top"; break;
-      }
-    };
-    this.prop["mw"]=w; this.prop["mh"]=h; 
-    if (!nls_isIE) this.prop["init"]=true;
-  }
-  this.prop["dur"]=parseFloat(nlsEffectList[this.effName].split(":")[1])*10;
-  this.prop["spd"]=15;
-  this.isOut=(isOut==true);
-  nlsMenu[this.mId].rt.ready=false;
-};
-
-function _slideRun() {
-  var me=this;
-  var p=new Object();
-  var l=parseInt(this.elm.style.left);
-  var t=parseInt(this.elm.style.top);
-  var c=this.isOut?1:0;
-  switch(this.prop["dir"]) {
-    case "right": p.x1=l; p.x2=-this.prop["mw"]*c; break;
-    case "left" : p.x1=l; p.x2=this.prop["mw"]*c; break;
-    case "down" : p.x1=t; p.x2=-this.prop["mh"]*c; break;
-    case "up"  : p.x1=t; p.x2=this.prop["mh"]*c; break;
-  };    
-  _fc_slide(p);
-  this.prop["pt"]=p;
-  this.prop["sd"]=0;
-  
-  _slidesEff[this.mId]=this;
-  if (!_slideTm) _slideTm=setInterval(function() {_slideAnimate();}, this.prop["spd"]);  
-};
-
-function _slideAnimate() {
-  var b=true;
-  for (var it in _slidesEff) {
-    var eff=_slidesEff[it];    
-    var p=eff.prop["pt"];
-    if (eff.prop["sd"] < eff.prop["dur"]) {
-      eff.elm.style[eff.prop["st"]]= effect_bezier(eff.prop["sd"]/eff.prop["dur"],p.x1, p.x2, p.c1, p.c2) + "px";
-      eff.prop["sd"]++;
-    } else {
-      eff.elm.style[eff.prop["st"]]=p.x2+"px";
-      if (eff.isOut) {eff.onHide();} else {nlsMenu[eff.mId].rt.ready=true; eff.onShow();}
-      delete _slidesEff[eff.mId];
-    }
-    b=false;
-  }
-  if (b) {clearInterval(_slideTm); _slideTm=null;}
-};
-
-function _fc_fade(p) {p.c1=p.x1+(p.x2-p.x1)*2/3; p.c2=p.x2;};/*for fadding*/
-function _fc_slide(p) {p.c1=p.x1+(p.x2-p.x1)*2/3; p.c2=p.x2;};
-function _f1(t) { return (1-t); };
-function _f2(t) { return (1-t)*(1-t); };
-function _f3(t) { return (1-t)*(1-t)*(1-t); };
-function _f4(t) { return t*t*t; };
-function effect_bezier(t,x1,x2,c1,c2) {
-  return _f3(t)*x1 + 3*t*_f2(t)*c1 + 3*t*t*_f1(t)*c2 + _f4(t)*x2;
-};
-
-/*end*/
-
-/*NlsMenu item effect*/
-function NlsMenuItemEffect(itemId, effName) {
-  this.tmId=null;
-  this.itemId=itemId;
-  this.elm=null;
-  this.effName=effName;
-};
-
-NlsMenuItemEffect.prototype.init=function() {
-  if(!nls_isIE) return;
-  if (this.elm==null) this.elm=NlsMenu.$GE(this.itemId); 
-  if (nlsEffectList[this.effName]) this.elm.style.filter=nlsEffectList[this.effName];
-  if (this.elm.filters.length>0) this.elm.filters[0].apply();
-};
-
-NlsMenuItemEffect.prototype.start=function() {
-  if(!nls_isIE) return;
-  if (this.elm.filters.length>0) this.elm.filters[0].play();
-};
-/*end*/
-
-/*NlsMenuBorder class*/
-function NlsMenuBorder(bTop, bBottom, bLeft, bRight) {
-  var border = "<table cellpadding=0 cellspacing=0>";
-  var sTop="", sBottom="", sLeft="", sRight="";
-  if (bTop) sTop="<td><table width='100%' cellpadding=0 cellspacing=0><tr><td class='@stlprf_mtop'></td></tr></table></td>";
-  if (bBottom) sBottom="<td><table width='100%' cellpadding=0 cellspacing=0><tr><td class='@stlprf_mbottom'></td></tr></table></td>";
-  if (bLeft) {
-    sLeft="<td height='100%' class='@stlprf_mleft' style='font-size:1pt;'>&nbsp;</td>";
-    if (bTop) sTop="<td class='@stlprf_mtopleft'></td>"+sTop;
-    if (bBottom) sBottom="<td class='@stlprf_mbottomleft'></td>"+sBottom;
-  }
-  if (bRight) {
-    sRight="<td height='100%' class='@stlprf_mright' style='font-size:1pt;'>&nbsp;</td>";
-    if (bTop) sTop+="<td class='@stlprf_mtopright'></td>";
-    if (bBottom) sBottom+="<td class='@stlprf_mbottomright'></td>";    
-  }
-  if (sTop!="") sTop="<tr>"+sTop+"</tr>";
-  if (sBottom!="") sBottom="<tr>"+sBottom+"</tr>";  
-  border=border+sTop+"<tr height='100%'>"+sLeft+"<td>@menu</td>"+sRight+"</tr>"+sBottom;
-  border+="</table>";
-  
-  this.applyBorder = function (smenu, stlprf) {
-    var b=border.replace(/@stlprf_/gi, stlprf);
-    return b.replace(/@menu/gi, smenu);
-  };
-  
-  return this;
-};
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/members_list.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/members_list.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/members_list.tpl	(revision 0)
@@ -1,74 +0,0 @@
-<!--##
-<NAME>Members List</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_Members"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_Members" templates="platform/members_list"/>
-		</div>
-		<div class="movable-element">
-			<!--## LIST OF USERS ##-->
-			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_users">
-				<inp2:u.all_InitList list_name="all_members"/>
-
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_Members"/> (<inp2:u.all_TotalRecords list_name="all_members"/>)
-				</inp2:m_Capture>
-
-				<inp2:m_include template="platform/elements/users.elm"/>
-
-				<table class="fullwidth">
-					<tr>
-						<td colspan="4">
-							<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-						</td>
-					</tr>
-					<tr class="sub-section-header">
-						<td><inp2:m_Phrase label="lu_col_Login"/></td>
-						<td><inp2:m_Phrase label="lu_col_LoggedIn"/></td>
-						<td><inp2:m_Phrase label="lu_col_Email"/></td>
-						<td><inp2:m_Phrase label="lu_col_MemberSince"/></td>
-					</tr>
-					<inp2:u.all_PrintList list_name="all_members" render_as="user_element" direction="H"/>
-				</table>
-
-				<inp2:m_include template="platform/elements/pagination.elm" prefix="u.all" list_name="all_members"/>
-			</inp2:m_RenderElement>
-			<!--## //LIST OF USERS ##-->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/ic_edit.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/menu_active_border.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/horizontal_dashed_line.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/script.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/script.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/script.js	(revision 0)
@@ -1,223 +0,0 @@
-String.prototype.trim = function() { return this.replace(/^\s+|\s+$/, ''); };
-
-function update_checkbox(cb, cb_hidden) {
-	cb_hidden.value = cb.checked ? 1 : 0;
-}
-
-function redirect($url) {
-	window.location.href = $url;
-}
-
-function open_window($url, $window_name, $width, $height) {
-	window.open($url, $window_name, 'width='+$width+',height='+$height+',resizable=yes');
-	return false;
-}
-
-function addLoadEvent(func, wnd) {
-	if (!wnd) wnd = window
-	var oldonload = wnd.onload;
-	if (typeof wnd.onload != 'function') {
-		wnd.onload = func;
-	} else {
-		wnd.onload = function() {
-			if (oldonload) {
-				oldonload();
-			}
-			func();
-		}
-	}
-}
-
-function addEvent(el, evname, func, traditional) {
-	if (traditional) {
-		eval('el.on'+evname+'='+func);
-		return;
-	}
-
-	if (document.all) {
-		el.attachEvent("on" + evname, func);
-	} else {
-		el.addEventListener(evname, func, true);
-	}
-};
-
-// ItemCategories class
-function ItemCategories($table_id, $field_id, $primary_category, $phrases) {
-	this.CategoryTable = document.getElementById($table_id);
-	this.CategorySelector = document.getElementById($field_id + '_select');
-	this.MoreCategoriesField = document.getElementById($field_id);
-	this.PrimaryCategory = $primary_category;
-	this.Phrases = $phrases;
-
-	// get additional categories from item
-	if (this.MoreCategoriesField.value.length) {
-		this.MoreCategories = this.MoreCategoriesField.value;
-		this.MoreCategories = this.MoreCategories.substring(1, this.MoreCategories.length - 1).split('|');
-	}
-	else {
-		this.MoreCategories = new Array ();
-	}
-}
-
-ItemCategories.prototype.AddCategory = function($separator, $delete_button, $max_categories) {
-	var $category_id = this.CategorySelector.options[this.CategorySelector.selectedIndex].value;
-	var $category_name = this.CategorySelector.options[this.CategorySelector.selectedIndex].innerHTML.trim();
-
-	if ((this.SearchCategory($category_id) !== false) || ($category_id == this.PrimaryCategory) || ($category_id == 0)) {
-		// don't add same category twice & don't allow to add item's primary category
-		alert(this.Phrases[1]);
-		return ;
-	}
-
-	if ((this.MoreCategories.length + 2) > $max_categories)
-	{
-		// don't add more category - $max_categories limit
-		alert(this.Phrases[0]);
-		return ;
-	}
-
-	// strip trailing HTML spaces & separator
-	var $separator_pos = $category_name.indexOf($separator);
-	if ($separator_pos != -1) {
-		$category_name = $category_name.substring($separator_pos + $separator.length);
-	}
-
-
-	var $row = this.CategoryTable.insertRow(-1);
-	$row.id = 'category_' + $category_id;
-
-	var $cell = $row.insertCell(-1);
-	$cell.innerHTML = $category_name;
-
-	$cell = $row.insertCell(-1);
-	$cell.innerHTML = $delete_button.replace(/#CATEGORY_ID#/g, $category_id);
-
-	this.MoreCategories.push($category_id);
-	this.updateMoreCategoriesField();
-}
-
-ItemCategories.prototype.SearchCategory = function($category_id) {
-	var $i = 0;
-	while ($i < this.CategoryTable.rows.length) {
-		if (this.CategoryTable.rows[$i].id == 'category_' + $category_id) {
-			return $i;
-		}
-		$i++;
-	}
-
-	return false;
-}
-
-ItemCategories.prototype.DeleteCategory = function($category_id) {
-	var $row_index = this.SearchCategory($category_id);
-
-	if ($row_index !== false) {
-		this.CategoryTable.deleteRow($row_index);
-		var $i = 0;
-		while ($i < this.MoreCategories.length) {
-			if (this.MoreCategories[$i] == $category_id) {
-				this.MoreCategories.splice($i, 1);
-				break;
-			}
-			$i++;
-		}
-		this.updateMoreCategoriesField();
-	}
-}
-
-ItemCategories.prototype.updateMoreCategoriesField = function() {
-	this.MoreCategoriesField.value = this.MoreCategories.length ? '|' + this.MoreCategories.join('|') + '|' : '';
-}
-
-function jq($selector) {
-	return $selector.replace(/(\[|\]|\.|:)/g, '\\$1');
-}
-
-function MultiLanguageSelector($language_info, $current_language) {
-	this._languageInfo = $language_info;
-	this._currentLanguage = $current_language;
-	this._controls = new Array ();
-
-	var $me = this;
-
-	$(document).ready(
-		function() {
-			$me.init();
-		}
-	);
-}
-
-MultiLanguageSelector.prototype.init = function () {
-	var $i = 0;
-	var $me = this;
-
-	while ($i < this._controls.length) {
-		// set current language
-		$( jq('#' + this._controls[$i]) ).data('PrevLanguage', this._currentLanguage);
-
-		for (var $language_id in this._languageInfo) {
-			var $id = this.inputForLanguage(this._controls[$i], $language_id);
-
-			$( jq('#' + $id + '_flag') ).each(
-				function() {
-					$(this)
-					.data('MainControl', $me._controls[$i])
-					.data('ThisLanguage', $language_id)
-					.click(
-						function ($event) {
-							var $this_flag = $(this);
-							var $this_language = $this_flag.data('ThisLanguage');
-
-							var $main_control = $('#' + jq($this_flag.data('MainControl')) );
-
-							var $prev_language = $main_control.data('PrevLanguage');
-							var $prev_flag = $( jq('#' + $me.inputForLanguage($main_control.attr('id'), $prev_language) + '_flag') );
-
-							var $language_info;
-
-							if ($this_language != $prev_language) {
-								// hide prev language input + enable it's flag
-								var $prev_image = $prev_flag.children('img:first');
-								if ($prev_image.length) {
-									// found image for given language
-									$language_info = $me._languageInfo[$prev_language];
-									$prev_image.attr('src', $prev_image.attr('src').replace($language_info.off, $language_info.on));
-								}
-								$( jq('#' + $prev_flag.attr('id').replace(/_flag$/, '_input') ) ).hide();
-
-								// show this language input + disable it's flag
-								var $this_image = $this_flag.children('img:first');
-								if ($this_image.length) {
-									// found image for given language
-									$language_info = $me._languageInfo[$this_language];
-									$this_image.attr('src', $this_image.attr('src').replace($language_info.on, $language_info.off));
-								}
-								var $this_container = $( jq('#' + $this_flag.attr('id').replace(/_flag$/, '_input') ) );
-								$this_container.show();
-
-								// focus on shown control
-								$('input:first, textarea:first', $this_container).focus();
-
-								// remember last used language
-								$main_control.data('PrevLanguage', $this_language);
-							}
-
-							$event.preventDefault();
-						}
-					);
-				}
-			);
-		}
-
-		$i++;
-	}
-}
-
-MultiLanguageSelector.prototype.inputForLanguage = function ($control_id, $language_id) {
-	return $control_id.replace('l' + this._currentLanguage + '_', 'l' + $language_id + '_');
-}
-
-MultiLanguageSelector.prototype.registerControl = function ($id) {
-	this._controls.push($id);
-}
-
Index: branches/5.1.x/themes/default2009/platform/login/forgot_password_reset.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/login/forgot_password_reset.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/login/forgot_password_reset.tpl	(revision 0)
@@ -1,72 +0,0 @@
-<!--##
-<NAME>Reset Password</NAME>
-<DESC></DESC>
-<SECTION>My Account||Login</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_PasswordRequestConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_PasswordRequestConfirm" templates="platform/login/forgot_password_reset"/>
-		</div>
-		<div class="movable-element">
-			<!-- forgot password reset -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_PasswordRequestConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_Phrase label="lu_text_PasswordRequestConfirm"/>
-
-				<br /><br />
-
-				<inp2:m_if check="u_TestCodeIsValid">
-					<form method="POST" action="<inp2:m_FormAction />">
-						<input type="submit" name="events[u][OnResetPasswordConfirmed]" value="<inp2:m_Phrase label="lu_btn_Yes"/>" class="button" />
-
-						<input type="button" value="<inp2:m_Phrase label="lu_btn_No"/>" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" />
-
-						<input type="hidden" name="user_key" value="<inp2:m_Get name="user_key"/>"/>
-						<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_confirm" />
-					</form>
-				<inp2:m_else />
-					<span class="error"><inp2:u_Error field="PwResetConfirm"/></span>
-					<br />	<br />
-					<a href="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>"><inp2:m_Phrase label="lu_ReturnToHome"/></a>
-				</inp2:m_if>
-			</inp2:m_RenderElement>
-			<!-- // forgot password reset -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/inportal_logo.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/calendar_icon.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/login/forgot_password_reset_confirm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/login/forgot_password_reset_confirm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/login/forgot_password_reset_confirm.tpl	(revision 0)
@@ -1,61 +0,0 @@
-<!--##
-<NAME>Password Reset Confirmed</NAME>
-<DESC></DESC>
-<SECTION>My Account||Login</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ForgotPasswordConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordConfirm" templates="platform/login/forgot_password_reset_confirm"/>
-		</div>
-		<div class="movable-element">
-			<!-- forgot password reset confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ForgotPasswordConfirm"/>
-				</inp2:m_Capture>
-
-				<form method="POST" action="<inp2:m_FormAction />">
-					<inp2:m_Phrase label="lu_text_ForgotPassHasBeenReset"/>
-
-					<br /><br />
-
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" class="button" onclick="redirect('<inp2:m_Link template="platform/login/register" next_template="index"/>');"/>
-				</form>
-			</inp2:m_RenderElement>
-			<!-- // forgot password reset confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/reviews.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/ajax.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/ajax.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/ajax.js	(revision 0)
@@ -1,263 +0,0 @@
-function preg_print_pre(obj, reg)
-{
-	if (!reg) reg = /.*/;
-	var p = ''
-	for (var prop in obj) {
-		if (prop.match(reg) ) {
-			p += prop + ': '+obj[prop] + '\n'
-		}
-	}
-	alert(p)
-}
-
-
-// Main AJAX classs
-function Request() {}
-
-Request.timeout = 60000; //60 seconds
-Request.method = 'GET';
-Request.headers = new Array();
-Request.params = null;
-
-Request.makeRequest = function(p_url, p_busyReq, p_progId, p_successCallBack, p_errorCallBack, p_pass, p_object) {
-	//p_url: the web service url
-	//p_busyReq: is a request for this object currently in progress?
-	//p_progId: element id where progress HTML should be shown
-	//p_successCallBack: callback function for successful response
-	//p_errorCallBack: callback function for erroneous response
-	//p_pass: string of params to pass to callback functions
-	//p_object: object of params to pass to callback functions
-
-	if (p_busyReq) return;
-	var req = Request.getRequest();
-	if (req != null) {
-		p_busyReq = true;
-		Request.showProgress(p_progId);
-		req.onreadystatechange = function() {
-			if (req.readyState == 4) {
-				p_busyReq = false;
-				window.clearTimeout(toId);
-				try {
-					if (req.status == 200) {
-	//					preg_print_pre(req)
-						p_successCallBack(req, p_pass, p_object);
-					} else {
-						p_errorCallBack(req, p_pass, p_object);
-					}
-					Request.hideProgress(p_progId);
-				}
-				catch (e) {
-//					alert('AJAX error')
-				}
-			}
-		}
-		var $ajax_mark = (p_url.indexOf('?') ? '&' : '?') + 'ajax=yes';
-		req.open(Request.method, p_url + $ajax_mark, true);
-
-		if (Request.method == 'POST') {
-			Request.headers['Content-type'] = 'application/x-www-form-urlencoded';
-			Request.headers['referer'] = p_url;
-		}
-		else {
-			Request.headers['If-Modified-Since'] = 'Sat, 1 Jan 2000 00:00:00 GMT';
-		}
-
-		Request.sendHeaders(req);
-		if (Request.method == 'POST') {
-			req.send(Request.params);
-			Request.method = 'GET'; // restore method back to GET
-		}
-		else {
-			req.send(null);
-		}
-
-		var toId = window.setTimeout( function() {if (p_busyReq) req.abort();}, Request.timeout );
-	}
-}
-
-Request.processRedirect = function($request) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($request.responseText);
-	if ($match_redirect != null) {
-		// redirect to external template requested
-		window.location.href = $match_redirect[1];
-		return true;
-	}
-	return false;
-}
-Request.sendHeaders = function($request) {
-	for (var $header_name in Request.headers) {
-		if (typeof Request.headers[$header_name] == 'function') {
-			continue;
-		}
-		$request.setRequestHeader($header_name, Request.headers[$header_name]);
-	}
-	Request.headers = new Array(); // reset header afterwards
-}
-
-Request.getRequest = function() {
-	var xmlHttp;
-	try { xmlHttp = new ActiveXObject('MSXML2.XMLHTTP'); return xmlHttp; } catch (e) {}
-	try { xmlHttp = new ActiveXObject('Microsoft.XMLHTTP'); return xmlHttp; } catch (e) {}
-	try { xmlHttp = new XMLHttpRequest(); return xmlHttp; } catch(e) {}
-	return null;
-}
-
-Request.showProgress = function(p_id) {
-	if (p_id != '') {
-		Request.setOpacity(20, p_id);
-
-		if (!document.getElementById(p_id + '_progress')) {
-			document.body.appendChild(Request.getProgressObject(p_id));
-		}
-		else {
-			var $progress_div = document.getElementById(p_id + '_progress');
-			$progress_div.style.top = getRealTop(p_id) + 'px';
-			$progress_div.style.height = document.getElementById(p_id).clientHeight;
-			$progress_div.style.display = 'block';
-		}
-//		document.getElementById(p_id).innerHTML = Request.getProgressHtml();
-	}
-}
-
-Request.hideProgress = function(p_id) {
-	if (p_id != '') {
-		document.getElementById(p_id + '_progress').style.display = 'none';
-		Request.setOpacity(100, p_id);
-	}
-}
-
-Request.setOpacity = function (opacity, id) {
-	var elem = typeof(id)=='string' ? document.getElementById(id) : id;
-    var object = elem.style;
-    object.opacity = (opacity / 100);
-    object.MozOpacity = (opacity / 100);
-    object.KhtmlOpacity = (opacity / 100);
-    object.filter = "alpha(opacity=" + opacity + ")";
-}
-
-Request.getProgressHtml = function() {
-	return "<p class='progress'>" + Request.progressText + "<br /><img src='img/ajax_progress.gif' align='absmiddle' width='100' height='7' alt='" + Request.progressText + "'/></p>";
-}
-
-Request.getProgressObject = function($id) {
-	var $div = document.createElement('DIV');
-	var $parent_div = document.getElementById($id);
-
-	$div.id = $id + '_progress';
-
-	$div.style.width = $parent_div.clientWidth + 'px';
-	$div.style.height = '150px'; // default height if div is empty (first ajax request for div)
-	$div.style.left = getRealLeft($parent_div) + 'px';
-	$div.style.top = getRealTop($parent_div) + 'px';
-	$div.style.position = 'absolute';
-
-	/*$div.style.border = '1px solid green';
-	$div.style.backgroundColor = '#FF0000';*/
-
-	$div.innerHTML = '<table style="width: 100%; height: 100%;"><tr><td style="text-align: center;">'+Request.progressText+'<br /><img src="img/ajax_progress.gif" align="absmiddle" width="100" height="7" alt="'+escape(Request.progressText)+'" /></td></tr></table>';
-	return $div;
-}
-
-Request.getErrorHtml = function(p_req) {
-	//TODO: implement accepted way to handle request error
-	return '[status: ' + p_req.status + '; status_text: ' + p_req.statusText + '; responce_text: ' + p_req.responseText + ']';
-}
-
-Request.serializeForm = function(theform) {
-	if (typeof(theform) == 'string') {
-		theform = document.getElementById(theform);
-	}
-
-	var els = theform.elements;
-	var len = els.length;
-	var queryString = '';
-
-	Request.addField = function(name, value) {
-		if (queryString.length > 0) queryString += '&';
-		queryString += encodeURIComponent(name) + '=' + encodeURIComponent(value);
-	};
-
-	for (var i = 0; i<len; i++) {
-		var el = els[i];
-    	if (el.disabled) continue;
-
-		switch(el.type) {
-			case 'text':
-			case 'password':
-			case 'hidden':
-			case 'textarea':
-          		Request.addField(el.name, el.value);
-				break;
-
-			case 'select-one':
-				if (el.selectedIndex >= 0) {
-            		Request.addField(el.name, el.options[el.selectedIndex].value);
-          		}
-          		break;
-
-			case 'select-multiple':
-				for (var j = 0; j < el.options.length; j++) {
-            		if (!el.options[j].selected) continue;
-              		Request.addField(el.name, el.options[j].value);
-          		}
-          		break;
-
-			case 'checkbox':
-			case 'radio':
-          		if (!el.checked) continue;
-            	Request.addField(el.name,el.value);
-          		break;
-      	}
-	}
-	return queryString;
-};
-
-function RatingManager ($url) {
-	this.Url = $url;
-	this.BusyRequest = false;
-}
-
-RatingManager.prototype.makeVote = function ($vote, $prefix, $id, $size) {
-	var $url = this.Url.replace('#PREFIX#', $prefix).replace('#VOTE#', $vote).replace('#ID#', $id).replace('#SIZE#', $size);
-
-	Request.makeRequest($url, this.BusyRequest, '', this.successCallback, this.errorCallback, [$vote, $prefix, $id], this);
-}
-
-RatingManager.prototype.successCallback = function ($request, $params, $object) {
-    var response = $request.responseText;
-
-    if (response.substring(0, 5) == '@err:') {
-    	alert(response.substring(5));
-    	return ;
-    }
-
-    document.getElementById('page_rating_' + $params[2]).innerHTML = response;
-}
-
-
-RatingManager.prototype.errorCallback = function($request, $params, $object) {
-	alert('AJAX Error; class: RatingManager; ' + Request.getErrorHtml($request));
-}
-
-function PollManager ($url) {
-	this.Url = $url;
-	this.BusyRequest = false;
-}
-
-PollManager.prototype.makeVote = function ($prefix, $poll_id, $option_id) {
-	var $url = this.Url.replace('#PREFIX#', $prefix).replace('#POLL_ID#', $poll_id).replace('#OPTION_ID#', $option_id);
-	Request.makeRequest($url, this.BusyRequest, '', this.successCallback, this.errorCallback, [$poll_id, $option_id], this);
-}
-
-PollManager.prototype.successCallback = function ($request, $params, $object) {
-    var response = $request.responseText;
-    if (response.substring(0, 5) == '@err:') {
-    	alert(response.substring(5));
-    	return ;
-    }
-    document.getElementById('pollvote_' + $params[0]).innerHTML = response;
-}
-
-PollManager.prototype.errorCallback = function($request, $params, $object) {
-	alert('AJAX Error; class: PollManager; ' + Request.getErrorHtml($request));
-}
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/background_table_blue.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/dmenu.css
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/dmenu.css	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/dmenu.css	(revision 0)
@@ -1,132 +0,0 @@
-/* Horizontal (menubar) menu */
-
-.horz_nlsmenu {
-    background-color: inherit;
-    z-index:1;
-    width: auto;
-}
-
-.horz_nlsitemcontainer {
-    height: 37px;
-    color: #ffffff;
-    padding: 0px 13px;
-}
-.horz_nlsiconcell {width:16px;}
-.horz_nlssubmenucell{width:20px;}
-
-.horz_nlsitem {
-    font-size:8pt;
-    color: #ffffff;
-    padding:2px 5px 2px 5px;
-}
-
-.horz_nlsitemcontainerover {
-    height: 37px;
-    background:url(../img/top_menu_select.gif);
-    padding: 0px 13px;
-}
-.horz_nlsiconcellover {width:16px;}
-.horz_nlssubmenucellover {width:20px;}
-
-.horz_nlsitemover {
-    font-size:8pt;
-    color: #FFFFFF;
-    padding:2px 5px 2px 5px;
-}
-
-.horz_nlsitemdisable {
-    font-family:verdana;
-    font-size:8pt;
-    color:#999999;
-    padding:2px 5px 2px 5px;
-}
-
-.horz_nlsseparatorcontainer {padding-left:0px; width:1px;}
-
-.horz_nlsseparator {
-    height:5px;
-    width:1px;
-    background-image:url(img/vseparator.gif);
-    background-position:center center;
-    background-repeat:repeat-x;
-}
-
-.horz_mtopleft {height:0px; width:0px;}
-.horz_mtopright {height:0px; width:0px;}
-.horz_mbottomleft {width:0px; height:0px;}
-.horz_mbottomright {width:0px; height:0px;}
-.horz_mtop {height:0px;}
-.horz_mbottom {height:0px;}
-.horz_mleft {width:0px;}
-.horz_mright {width:0px;}
-
-.horz_horzshadow { -moz-opacity:0.4; background-repeat:no-repeat; background-image:url(img/hshadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0,  FinishX=100, StartY=0, FinishY=100);}
-.horz_vertshadow { -moz-opacity:0.4; background-repeat:no-repeat; background-image:url(img/vshadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0,  FinishX=100, StartY=0, FinishY=100);}
-.horz_cornshadow { -moz-opacity:0.4; background-repeat:no-repeat; background-image:url(img/cornershadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0,  FinishX=100, StartY=0, FinishY=100);}
-
-
-/* Vertical (drop-down) menus */
-
-.nlsmenu {
-    background-color: #105596;
-    z-index:1;
-    width: auto !important;
-    color: #ffffff;
-    padding: 2px 2px;
-    border: 1px solid #6291BB;
-}
-
-.nlsitemcontainer {
-    height:25px;
-    padding:2px 10px 2px 10px;
-    border: 1px solid #6291BB;
-}
-.nlsiconcell {width:22px;}
-.nlssubmenucell{width:20px;}
-.nlsitem {
-    font-size:8pt;
-    color: #ffffff;
-    padding:0px 7px;
-}
-
-.nlsitemcontainerover {
-    height:25px;
-    border: 1px solid #6291BB;
-    background:url(../img/top_menu_select.gif);
-    padding: 2px 10px 2px 10px;
-}
-.nlsiconcellover {width:22px;}
-.nlssubmenucellover {width:20px;}
-.nlsitemover {
-    font-size:8pt;
-    color:#ffffff;
-    padding:0px 7px;
-}
-
-.nlsitemdisable {
-    font-size:8pt;
-    color:#999999;
-    padding:2px 5px 2px 5px;
-}
-
-.nlsseparatorcontainer {padding-left:28px;}
-
-.nlsseparator {
-    height:5px;
-    background-image:url(img/separator.gif);
-    background-position:center center;
-    background-repeat:repeat-x;
-}
-
-.mtopleft {height:0px; width:0px;}
-.mtopright {height:0px; width:0px;}
-.mbottomleft {width:0px; height:0px;}
-.mbottomright {width:0px; height:0px;}
-.mtop {height:0px;}
-.mbottom {height:0px;}
-.mleft {width:0px;}
-.mright {width:0px;}
-
-.horzshadow {  -moz-opacity:0.4;background-repeat:no-repeat; background-image:url(img/hshadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0,  FinishX=100, StartY=0, FinishY=100);}
-.vertshadow {  -moz-opacity:0.4;background-repeat:no-repeat; background-image:url(img/vshadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0,  FinishX=100, StartY=0, FinishY=100);}
-.cornshadow {  -moz-opacity:0.4;background-repeat:no-repeat; background-image:url(img/cornershadow.gif);filter:progid:DXImageTransform.Microsoft.Alpha( Opacity=40, FinishOpacity=0, Style=0, StartX=0,  FinishX=100, StartY=0, FinishY=100);}
Index: branches/5.1.x/themes/default2009/platform/img/gradient_background.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/mailing_list/unsubscribe_ok.tpl	(revision 0)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>Unsubscribe Confirmed</NAME>
-<DESC>Unsubscribe from mailing list confirmed</DESC>
-<SECTION>Mailing List</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_UnsubscribeOk"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UnsubscribeConfirm,lu_title_UnsubscribeOk" templates="platform/mailing_list/unsubscribe,platform/mailing_list/unsubscribe_ok"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_UnsubscribeOk"/>
-				</inp2:m_Capture>
-
-				<inp2:m_Phrase label="lu_TextUnsubscribe"/>
-				<br /><br />
-
-				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/my_account/public_profile.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/my_account/public_profile.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/my_account/public_profile.tpl	(revision 0)
@@ -1,90 +0,0 @@
-<!--##
-<NAME>Profile</NAME>
-<DESC></DESC>
-<SECTION>My Account</SECTION>
-##-->
-
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_UserProfile"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-element">
-		<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-	</div>
-	<div class="movable-element">
-		<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-	</div>
-	<div class="movable-element">
-		<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-	</div>
-	<div class="movable-element">
-		<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserProfile" templates="platform/my_account/public_profile"/>
-		</div>
-		<div class="movable-element">
-			<!-- public profile -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_UserProfile"/>
-				</inp2:m_Capture>
-
-				<inp2:u.profile_Image render_as="image_element" primary="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="60"/><br clear="all"/>
-
-				<table class="form-data fullwidth">
-					<tr>
-						<td class="field-name"><inp2:m_phrase name="lu_fld_Login"/></td>
-						<td class="field-value"><inp2:u.profile_Field field="Login"/></td>
-					</tr>
-
-					<inp2:m_if check="user-profile_ProfileFieldCount">
-					<tr>
-						<td colspan="3">
-							<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-						</td>
-					</tr>
-					</inp2:m_if>
-
-					<inp2:m_include template="platform/elements/preferences.elm"/>
-
-					<inp2:m_RenderElement name="profile_element" field="pp_firstname" title="lu_fld_FirstName"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_lastname" title="lu_fld_LastName"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_dob" title="lu_fld_BirthDate"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_email" title="lu_fld_Email"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_phone" title="lu_fld_Phone"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_street" title="lu_fld_Street"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_city" title="lu_fld_City"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_state" title="lu_fld_State"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_zip" title="lu_fld_Zip"/>
-					<inp2:m_RenderElement name="profile_element" field="pp_country" title="lu_fld_Country"/>
-
-					<tr>
-						<td colspan="3">
-							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
-						</td>
-					</tr>
-
-					<inp2:m_if check="m_ModuleEnabled" module="In-Bulletin">
-						<inp2:m_include template="in-bulletin/elements/content_boxes/contact_user.elm"/>
-					</inp2:m_if>
-
-				</table>
-			</inp2:m_RenderElement>
-			<!-- // public profile -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/recommend/recommend.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/recommend/recommend.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/recommend/recommend.tpl	(revision 0)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>Recommend</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_RecommendConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_RecommendConfirm" templates="platform/recommend/recommend"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_RecommendConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_Phrase label="lu_recommend_confirm_text" />
-				<br /><br />
-
-				<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" />');" value="<inp2:m_Phrase label="lu_btn_Ok"/>"/>
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
Index: branches/5.1.x/themes/default2009/platform/img/background_table_grey.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/icon_home.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/doc.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/forums_dir.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/login/register_confirm_pending.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/login/register_confirm_pending.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/login/register_confirm_pending.tpl	(revision 0)
@@ -1,51 +0,0 @@
-<!--##
-<NAME>Registration Pending</NAME>
-<DESC></DESC>
-<SECTION>My Account||Login</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_RegistrationPendingConfirmation"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration,lu_title_RegistrationPendingConfirmation" templates="platform/login/register,platform/login/register_confirm_pending"/>
-		</div>
-		<div class="movable-element">
-			<!-- registration pending confirmation -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_RegistrationPendingConfirmation"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_RegistrationPending"/>
-			</inp2:m_RenderElement>
-			<!-- // registration pending confirmation -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/ic_delete.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/icon_hot.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/my_account/my_preferences.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/my_account/my_preferences.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/my_account/my_preferences.tpl	(revision 0)
@@ -1,122 +0,0 @@
-<!--##
-<NAME>My Preferences</NAME>
-<DESC></DESC>
-<SECTION>My Account</SECTION>
-##-->
-
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_MyPreferences"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyPreferences" templates="platform/my_account/my_account,platform/my_account/my_preferences"/>
-		</div>
-		<div class="movable-element">
-			<!-- my preferences -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_MyPreferences"/>
-				</inp2:m_Capture>
-
-				<table class="fullwidth tab-bottom-line">
-					<tr>
-						<td class="tab-left-padding">
-
-							<table>
-								<tr>
-									<inp2:m_ModuleInclude template="my_account/preferences_tab.elm" in-portal_template="platform/my_account/preferences_tab.elm"/>
-								</tr>
-							</table>
-
-						</td>
-					</tr>
-				</table>
-				<br/>
-				<strong><inp2:m_Phrase name="lu_Profile"/></strong><br /><br />
-
-				<form method="post" action="<inp2:m_FormAction/>">
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-					<table class="form-data fullwidth">
-						<tr>
-							<td style="width:140px">
-								<inp2:m_phrase name="lu_col_AccountInformation"/>
-							</td>
-							<td style="width:140px">
-								<inp2:m_phrase name="lu_col_CurrentValue"/>
-							</td>
-							<td>
-								<inp2:m_phrase name="lu_col_DisplayToPublic"/>
-							</td>
-						</tr>
-
-						<tr>
-							<td class="field-name"><inp2:m_phrase name="lu_fld_Login"/></td>
-							<td><inp2:u_Field field="Login"/></td>
-							<td class="field-value">&nbsp;</td>
-						</tr>
-
-						<tr>
-							<td colspan="3">
-								<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-							</td>
-						</tr>
-
-						<inp2:m_include template="platform/elements/preferences.elm"/>
-
-						<inp2:m_RenderElement name="privacy_element" field="pp_firstname" title="lu_fld_FirstName"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_lastname" title="lu_fld_LastName"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_dob" title="lu_fld_BirthDate"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_email" title="lu_fld_Email"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_phone" title="lu_fld_Phone"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_street" title="lu_fld_AddressLine1"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_city" title="lu_fld_City"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_state" title="lu_fld_State"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_zip" title="lu_fld_Zip"/>
-						<inp2:m_RenderElement name="privacy_element" field="pp_country" title="lu_fld_Country" is_last="1"/>
-
-						<tr>
-							<td colspan="3">
-								<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
-							</td>
-						</tr>
-						<tr>
-							<td>&nbsp;
-
-							</td>
-							<td>
-								<br />
-								<input class="button" type="submit" name="events[user-profile][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
-								<br /><br />
-							</td>
-							<td class="field-value">
-								<a href="<inp2:u.current_ProfileLink template="platform/my_account/public_profile"/>"><inp2:m_phrase name="lu_btn_ViewYourProfile"/></a>
-							</td>
-						</tr>
-					</table>
-				</form>
-			</inp2:m_RenderElement>
-			<!-- // my preferences -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/forums_locked.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/forums_no_new_post.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/error_notfound.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/error_notfound.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/error_notfound.tpl	(revision 0)
@@ -1,58 +0,0 @@
-<!--##
-<NAME>Page Not Found</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## SET 404 HEADER FOR RESPONSE ##-->
-<inp2:m_header data="HTTP/1.0 404 Not Found"/>
-<!--## //SET 404 HEADER FOR RESPONSE ##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_PageNotFound"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_PageNotFound" templates="error_nofound"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_PageNotFound"/>
-				</inp2:m_Capture>
-				<br /><br />
-				<inp2:m_phrase name="lu_text_PageNotFound"/>
-				<br /><br />
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/icon_popular.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/calendar.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/calendar.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/calendar.js	(revision 0)
@@ -1,1320 +0,0 @@
-var cbPath = "";
-             /*
-preloadImage(cbPath);
-preloadImage(cbPathO);
-preloadImage(cbPathA);
-*/
-
-//addScript("core.js");
-//addScript("lang.js");
-
-//addCss("wnd.css");
-//addCss("calendar.css");
-
-function initCalendar(id, dateFormat)
-{
-	var input = document.getElementById(id);
-	if (!input) return;
-	input.dateFormat = dateFormat;
-	var cbPath = input.getAttribute("datepickerIcon");
-	
-	var inputContainer = document.createElement("DIV");
-	inputContainer.className = "dpContainer";
-	inputContainer.noWrap = true;
-	var pNode = input.parentNode;
-	pNode.insertBefore(inputContainer, input.nextSibling);
-//	   inputContainer.appendChild(pNode.removeChild(input));
-
-	var calendarButton = document.createElement("IMG");
-	calendarButton.setAttribute("width", "19");
-	calendarButton.setAttribute("height", "15");
-	calendarButton.setAttribute("align", "absMiddle");
-	calendarButton.style.width=19
-	calendarButton.style.height=15
-	calendarButton.style.cursor = "hand";
-
-	calendarButton.setAttribute("hspace", 2);
-	calendarButton.src = cbPath;
-	calendarButton.style.paddingLeft = '10px';
-	calendarButton.onmouseover = cbMouseOver;
-	calendarButton.onmouseout = cbMouseOut;
-	calendarButton.onmouseup = calendarButton.onmouseout;
-	calendarButton.onmousedown = cbMouseDown;
-	calendarButton.showCalendar = wnd_showCalendar;
-	inputContainer.appendChild(calendarButton);
-	inputContainer.dateInput = input;
-}
-
-var calendar;
-
-function cbMouseOver(e)
-{
-	//   this.src = cbPathO;
-	var evt = (e) ? e : event; if (evt) evt.cancelBubble = true;
-}
-
-function cbMouseOut(e)
-{
-	//   this.src = cbPath;
-	var evt = (e) ? e : event; if (evt) evt.cancelBubble = true;
-}
-
-function cbMouseDown(e)
-{
-	//   this.src = cbPathA;
-	// alert("cbMouseDown");
-	var evt = (e) ? e : event; if (evt) evt.cancelBubble = true;
-	this.showCalendar();
-}
-
-function wnd_showCalendar()
-{
-	var el = this.parentNode.dateInput;
-	if (calendar != null) calendar.hide();
-	else
-	{
-		var calendarObject = new Calendar(false, null, dateSelected, closeHandler);
-		calendar = calendarObject;
-		calendarObject.setRange(1900, 2070);
-		calendarObject.create();
-	}
-	calendar.setDateFormat(el.dateFormat);
-	calendar.parseDate(el.value);
-	calendar.sel = el;
-	calendar.showAtElement(el);
-
-	Calendar.addEvent(document, "mousedown", checkCalendar);
-	return false;
-}
-
-function dateSelected(calendarObject, date)
-{
-	calendarObject.sel.value = date;
-	calendarObject.callCloseHandler();
-}
-
-function closeHandler(calendarObject)
-{
-	calendarObject.hide();
-	Calendar.removeEvent(document, "mousedown", checkCalendar);
-}
-
-function checkCalendar(ev)
-{
-	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
-
-	for (; el != null; el = el.parentNode)
-	if (el == calendar.element || el.tagName == "A") break;
-
-	if (el == null)
-	{
-		calendar.callCloseHandler();
-		Calendar.stopEvent(ev);
-	}
-}
-
-function preloadImage(path)
-{
-	var img = new Image();
-	img.src = path;
-	preloadImages.push(img);
-}
-
-function addCss(path)
-{
-	path = cssPath + path;
-	document.write("<link rel='stylesheet' href='" + path + "' type='text/css'/>");
-}
-
-/*<CORE>*/
-/* Copyright Mihai Bazon, 2002
-* http://students.infoiasi.ro/~mishoo
-*
-* Version: 0.9.1
-*
-* Feel free to use this script under the terms of the GNU General Public
-* License, as long as you do not remove or alter this notice.
-*/
-
-/** The Calendar object constructor. */
-Calendar = function (mondayFirst, dateStr, onSelected, onClose) {
-	// member variables
-	this.activeDiv = null;
-	this.currentDateEl = null;
-	this.checkDisabled = null;
-	this.timeout = null;
-	this.onSelected = onSelected || null;
-	this.onClose = onClose || null;
-	this.dragging = false;
-	this.minYear = 1970;
-	this.maxYear = 2050;
-	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
-	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
-	this.isPopup = true;
-	this.mondayFirst = mondayFirst;
-	this.dateStr = dateStr;
-	// HTML elements
-	this.table = null;
-	this.element = null;
-	this.tbody = null;
-	this.daynames = null;
-	// Combo boxes
-	this.monthsCombo = null;
-	this.yearsCombo = null;
-	this.hilitedMonth = null;
-	this.activeMonth = null;
-	this.hilitedYear = null;
-	this.activeYear = null;
-
-	// one-time initializations
-	if (!Calendar._DN3) {
-		// table of short day names
-		var ar = new Array();
-		for (var i = 8; i > 0;) {
-			ar[--i] = Calendar._DN[i].substr(0, 3);
-		}
-		Calendar._DN3 = ar;
-		// table of short month names
-		ar = new Array();
-		for (var i = 12; i > 0;) {
-			ar[--i] = Calendar._MN[i].substr(0, 3);
-		}
-		Calendar._MN3 = ar;
-	}
-};
-
-// ** constants
-
-/// "static", needed for event handlers.
-Calendar._C = null;
-
-/// detect a special case of "web browser"
-Calendar.is_ie = ( (navigator.userAgent.toLowerCase().indexOf("msie") != -1) &&
-(navigator.userAgent.toLowerCase().indexOf("opera") == -1) );
-
-// short day names array (initialized at first constructor call)
-Calendar._DN3 = null;
-
-// short month names array (initialized at first constructor call)
-Calendar._MN3 = null;
-
-// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
-//        library, at some point.
-
-Calendar.getAbsolutePos = function(el) {
-	var r = { x: el.offsetLeft, y: el.offsetTop };
-	if (el.offsetParent) {
-		var tmp = Calendar.getAbsolutePos(el.offsetParent);
-		r.x += tmp.x;
-		r.y += tmp.y;
-	}
-	return r;
-};
-
-Calendar.isRelated = function (el, evt) {
-	var related = evt.relatedTarget;
-	if (!related) {
-		var type = evt.type;
-		if (type == "mouseover") {
-			related = evt.fromElement;
-		} else if (type == "mouseout") {
-			related = evt.toElement;
-		}
-	}
-	while (related) {
-		if (related == el) {
-			return true;
-		}
-		related = related.parentNode;
-	}
-	return false;
-};
-
-Calendar.removeClass = function(el, className) {
-	if (!(el && el.className)) {
-		return;
-	}
-	var cls = el.className.split(" ");
-	var ar = new Array();
-	for (var i = cls.length; i > 0;) {
-		if (cls[--i] != className) {
-			ar[ar.length] = cls[i];
-		}
-	}
-	el.className = ar.join(" ");
-};
-
-Calendar.addClass = function(el, className) {
-	el.className += " " + className;
-};
-
-Calendar.getElement = function(ev) {
-	if (Calendar.is_ie) {
-		return window.event.srcElement;
-	} else {
-		return ev.currentTarget;
-	}
-};
-
-Calendar.getTargetElement = function(ev) {
-	if (Calendar.is_ie) {
-		return window.event.srcElement;
-	} else {
-		return ev.target;
-	}
-};
-
-Calendar.stopEvent = function(ev) {
-	if (Calendar.is_ie) {
-		window.event.cancelBubble = true;
-		window.event.returnValue = false;
-	} else {
-		ev.preventDefault();
-		ev.stopPropagation();
-	}
-};
-
-Calendar.addEvent = function(el, evname, func) {
-	if (Calendar.is_ie) {
-		el.attachEvent("on" + evname, func);
-	} else {
-		el.addEventListener(evname, func, true);
-	}
-};
-
-Calendar.removeEvent = function(el, evname, func) {
-	if (Calendar.is_ie) {
-		el.detachEvent("on" + evname, func);
-	} else {
-		el.removeEventListener(evname, func, true);
-	}
-};
-
-Calendar.createElement = function(type, parent) {
-	var el = null;
-	if (document.createElementNS) {
-		// use the XHTML namespace; IE won't normally get here unless
-		// _they_ "fix" the DOM2 implementation.
-		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
-	} else {
-		el = document.createElement(type);
-	}
-	if (typeof parent != "undefined") {
-		parent.appendChild(el);
-	}
-	return el;
-};
-
-// END: UTILITY FUNCTIONS
-
-// BEGIN: CALENDAR STATIC FUNCTIONS
-
-/** Internal -- adds a set of events to make some element behave like a button. */
-Calendar._add_evs = function(el) {
-	with (Calendar) {
-		addEvent(el, "mouseover", dayMouseOver);
-		addEvent(el, "mousedown", dayMouseDown);
-		addEvent(el, "mouseout", dayMouseOut);
-		if (is_ie) {
-			addEvent(el, "dblclick", dayMouseDblClick);
-			el.setAttribute("unselectable", true);
-		}
-	}
-};
-
-Calendar.findMonth = function(el) {
-	if (typeof el.month != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.month != "undefined") {
-		return el.parentNode;
-	}
-	return null;
-};
-
-Calendar.findYear = function(el) {
-	if (typeof el.year != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.year != "undefined") {
-		return el.parentNode;
-	}
-	return null;
-};
-
-Calendar.showMonthsCombo = function () {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var mc = cal.monthsCombo;
-	if (cal.hilitedMonth) {
-		Calendar.removeClass(cal.hilitedMonth, "hilite");
-	}
-	if (cal.activeMonth) {
-		Calendar.removeClass(cal.activeMonth, "active");
-	}
-	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
-	Calendar.addClass(mon, "active");
-	cal.activeMonth = mon;
-	mc.style.left = cd.offsetLeft;
-	mc.style.top = cd.offsetTop + cd.offsetHeight;
-	mc.style.display = "block";
-};
-
-Calendar.showYearsCombo = function (fwd) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var yc = cal.yearsCombo;
-	if (cal.hilitedYear) {
-		Calendar.removeClass(cal.hilitedYear, "hilite");
-	}
-	if (cal.activeYear) {
-		Calendar.removeClass(cal.activeYear, "active");
-	}
-	cal.activeYear = null;
-	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
-	var yr = yc.firstChild;
-	var show = false;
-	for (var i = 12; i > 0; --i) {
-		if (Y >= cal.minYear && Y <= cal.maxYear) {
-			yr.firstChild.data = Y;
-			yr.year = Y;
-			yr.style.display = "block";
-			show = true;
-		} else {
-			yr.style.display = "none";
-		}
-		yr = yr.nextSibling;
-		Y += fwd ? 2 : -2;
-	}
-	if (show) {
-		yc.style.left = cd.offsetLeft;
-		yc.style.top = cd.offsetTop + cd.offsetHeight;
-		yc.style.display = "block";
-	}
-};
-
-// event handlers
-
-Calendar.tableMouseUp = function(ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	if (cal.timeout) {
-		clearTimeout(cal.timeout);
-	}
-	var el = cal.activeDiv;
-	if (!el) {
-		return false;
-	}
-	var target = Calendar.getTargetElement(ev);
-	Calendar.removeClass(el, "active");
-	if (target == el || target.parentNode == el) {
-		Calendar.cellClick(el);
-	}
-	var mon = Calendar.findMonth(target);
-	var date = null;
-	if (mon) {
-		date = new Date(cal.date);
-		if (mon.month != date.getMonth()) {
-			date.setMonth(mon.month);
-			cal.setDate(date);
-		}
-	} else {
-		var year = Calendar.findYear(target);
-		if (year) {
-			date = new Date(cal.date);
-			if (year.year != date.getFullYear()) {
-				date.setFullYear(year.year);
-				cal.setDate(date);
-			}
-		}
-	}
-	with (Calendar) {
-		removeEvent(document, "mouseup", tableMouseUp);
-		removeEvent(document, "mouseover", tableMouseOver);
-		removeEvent(document, "mousemove", tableMouseOver);
-		cal._hideCombos();
-		stopEvent(ev);
-		_C = null;
-	}
-};
-
-Calendar.tableMouseOver = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return;
-	}
-	var el = cal.activeDiv;
-	var target = Calendar.getTargetElement(ev);
-	if (target == el || target.parentNode == el) {
-		Calendar.addClass(el, "hilite active");
-	} else {
-		Calendar.removeClass(el, "active");
-		Calendar.removeClass(el, "hilite");
-	}
-	var mon = Calendar.findMonth(target);
-	if (mon) {
-		if (mon.month != cal.date.getMonth()) {
-			if (cal.hilitedMonth) {
-				Calendar.removeClass(cal.hilitedMonth, "hilite");
-			}
-			Calendar.addClass(mon, "hilite");
-			cal.hilitedMonth = mon;
-		} else if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-	} else {
-		var year = Calendar.findYear(target);
-		if (year) {
-			if (year.year != cal.date.getFullYear()) {
-				if (cal.hilitedYear) {
-					Calendar.removeClass(cal.hilitedYear, "hilite");
-				}
-				Calendar.addClass(year, "hilite");
-				cal.hilitedYear = year;
-			} else if (cal.hilitedYear) {
-				Calendar.removeClass(cal.hilitedYear, "hilite");
-			}
-		}
-	}
-	Calendar.stopEvent(ev);
-};
-
-Calendar.tableMouseDown = function (ev) {
-	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
-		Calendar.stopEvent(ev);
-	}
-};
-
-Calendar.calDragIt = function (ev) {
-	var cal = Calendar._C;
-	if (!(cal && cal.dragging)) {
-		return false;
-	}
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posX = ev.pageX;
-		posY = ev.pageY;
-	}
-	cal.hideShowCovered();
-	var st = cal.element.style;
-	st.left = (posX - cal.xOffs) + "px";
-	st.top = (posY - cal.yOffs) + "px";
-	Calendar.stopEvent(ev);
-};
-
-Calendar.calDragEnd = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	cal.dragging = false;
-	with (Calendar) {
-		removeEvent(document, "mousemove", calDragIt);
-		removeEvent(document, "mouseover", stopEvent);
-		removeEvent(document, "mouseup", calDragEnd);
-		tableMouseUp(ev);
-	}
-	cal.hideShowCovered();
-};
-
-Calendar.dayMouseDown = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (el.disabled) {
-		return false;
-	}
-	var cal = el.calendar;
-	cal.activeDiv = el;
-	Calendar._C = cal;
-	if (el.navtype != 300) with (Calendar) {
-		addClass(el, "hilite active");
-		addEvent(document, "mouseover", tableMouseOver);
-		addEvent(document, "mousemove", tableMouseOver);
-		addEvent(document, "mouseup", tableMouseUp);
-	} else if (cal.isPopup) {
-		cal._dragStart(ev);
-	}
-	Calendar.stopEvent(ev);
-	if (el.navtype == -1 || el.navtype == 1) {
-		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
-	} else if (el.navtype == -2 || el.navtype == 2) {
-		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
-	} else {
-		cal.timeout = null;
-	}
-};
-
-Calendar.dayMouseDblClick = function(ev) {
-	Calendar.cellClick(Calendar.getElement(ev));
-	if (Calendar.is_ie) {
-		document.selection.empty();
-	}
-};
-
-Calendar.dayMouseOver = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
-		return false;
-	}
-	if (el.ttip) {
-		if (el.ttip.substr(0, 1) == "_") {
-			var date = null;
-			with (el.calendar.date) {
-				date = new Date(getFullYear(), getMonth(), el.caldate);
-			}
-			el.ttip = date.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
-		}
-		el.calendar.tooltips.firstChild.data = el.ttip;
-	}
-	if (el.navtype != 300) {
-		Calendar.addClass(el, "hilite");
-	}
-	Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseOut = function(ev) {
-	with (Calendar) {
-		var el = getElement(ev);
-		if (isRelated(el, ev) || _C || el.disabled) {
-			return false;
-		}
-		removeClass(el, "hilite");
-		el.calendar.tooltips.firstChild.data = _TT["SEL_DATE"];
-		stopEvent(ev);
-	}
-};
-
-/**
-*  A generic "click" handler :) handles all types of buttons defined in this
-*  calendar.
-*/
-Calendar.cellClick = function(el) {
-	var cal = el.calendar;
-	var closing = false;
-	var newdate = false;
-	var date = null;
-	if (typeof el.navtype == "undefined") {
-		Calendar.removeClass(cal.currentDateEl, "selected");
-		Calendar.addClass(el, "selected");
-		closing = (cal.currentDateEl == el);
-		if (!closing) {
-			cal.currentDateEl = el;
-		}
-		cal.date.setDate(el.caldate);
-		date = cal.date;
-		newdate = true;
-	} else {
-		if (el.navtype == 200) {
-			Calendar.removeClass(el, "hilite");
-			cal.callCloseHandler();
-			return;
-		}
-		date = (el.navtype == 0) ? new Date() : new Date(cal.date);
-		var year = date.getFullYear();
-		var mon = date.getMonth();
-		var setMonth = function (mon) {
-			var day = date.getDate();
-			var max = date.getMonthDays();
-			if (day > max) {
-				date.setDate(max);
-			}
-			date.setMonth(mon);
-		};
-		switch (el.navtype) {
-			case -2:
-			if (year > cal.minYear) {
-				date.setFullYear(year - 1);
-			}
-			break;
-			case -1:
-			if (mon > 0) {
-				setMonth(mon - 1);
-			} else if (year-- > cal.minYear) {
-				date.setFullYear(year);
-				setMonth(11);
-			}
-			break;
-			case 1:
-			if (mon < 11) {
-				setMonth(mon + 1);
-			} else if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-				setMonth(0);
-			}
-			break;
-			case 2:
-			if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-			}
-			break;
-			case 100:
-			cal.setMondayFirst(!cal.mondayFirst);
-			return;
-		}
-		if (!date.equalsTo(cal.date)) {
-			cal.setDate(date);
-			newdate = el.navtype == 0;
-		}
-	}
-	if (newdate) {
-		cal.callHandler();
-	}
-	if (closing) {
-		Calendar.removeClass(el, "hilite");
-		cal.callCloseHandler();
-	}
-};
-
-// END: CALENDAR STATIC FUNCTIONS
-
-// BEGIN: CALENDAR OBJECT FUNCTIONS
-
-/**
-*  This function creates the calendar inside the given parent.  If _par is
-*  null than it creates a popup calendar inside the BODY element.  If _par is
-*  an element, be it BODY, then it creates a non-popup calendar (still
-*  hidden).  Some properties need to be set before calling this function.
-*/
-Calendar.prototype.create = function (_par) {
-	var parent = null;
-	if (! _par) {
-		// default parent is the document body, in which case we create
-		// a popup calendar.
-		parent = document.getElementsByTagName("body")[0];
-		this.isPopup = true;
-	} else {
-		parent = _par;
-		this.isPopup = false;
-	}
-	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
-
-	var table = Calendar.createElement("table");
-	this.table = table;
-	table.cellSpacing = 0;
-	table.cellPadding = 0;
-	table.style.width = 'auto';
-	table.calendar = this;
-	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
-
-	var div = Calendar.createElement("div");
-	this.element = div;
-	div.className = "calendar";
-	if (this.isPopup) {
-		div.style.position = "absolute";
-		div.style.display = "none";
-	}
-	div.appendChild(table);
-
-	var thead = Calendar.createElement("thead", table);
-	var cell = null;
-	var row = null;
-
-	var cal = this;
-	var hh = function (text, cs, navtype) {
-		cell = Calendar.createElement("td", row);
-		cell.colSpan = cs;
-		cell.className = "calendar_button";
-		Calendar._add_evs(cell);
-		cell.calendar = cal;
-		cell.navtype = navtype;
-		if (text.substr(0, 1) != "&") {
-			cell.appendChild(document.createTextNode(text));
-		}
-		else {
-			// FIXME: dirty hack for entities
-			cell.innerHTML = text;
-		}
-		return cell;
-	};
-
-	row = Calendar.createElement("tr", thead);
-	row.className = "headrow";
-
-	hh("-", 1, 100).ttip = Calendar._TT["TOGGLE"];
-	this.title = hh("", this.isPopup ? 5 : 6, 300);
-	this.title.className = "title";
-	if (this.isPopup) {
-		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		this.title.style.cursor = "move";
-		hh("X", 1, 200).ttip = Calendar._TT["CLOSE"];
-	}
-
-	row = Calendar.createElement("tr", thead);
-	row.className = "headrow";
-
-	hh("&#x00ab;", 1, -2).ttip = Calendar._TT["PREV_YEAR"];
-	hh("&#x2039;", 1, -1).ttip = Calendar._TT["PREV_MONTH"];
-	hh(Calendar._TT["TODAY"], 3, 0).ttip = Calendar._TT["GO_TODAY"];
-	hh("&#x203a;", 1, 1).ttip = Calendar._TT["NEXT_MONTH"];
-	hh("&#x00bb;", 1, 2).ttip = Calendar._TT["NEXT_YEAR"];
-
-	// day names
-	row = Calendar.createElement("tr", thead);
-	row.className = "daynames";
-	this.daynames = row;
-	for (var i = 7; i > 0; --i) {
-		cell = Calendar.createElement("td", row);
-		cell.appendChild(document.createTextNode(""));
-		if (!i) {
-			cell.navtype = 100;
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-	this._displayWeekdays();
-
-	var tbody = Calendar.createElement("tbody", table);
-	this.tbody = tbody;
-
-	for (i = 6; i > 0; --i) {
-		row = Calendar.createElement("tr", tbody);
-		for (var j = 7; j > 0; --j) {
-			cell = Calendar.createElement("td", row);
-			cell.appendChild(document.createTextNode(""));
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-
-	var tfoot = Calendar.createElement("tfoot", table);
-
-	row = Calendar.createElement("tr", tfoot);
-	row.className = "footrow";
-
-	cell = hh(Calendar._TT["SEL_DATE"], 7, 300);
-	cell.className = "title";
-	if (this.isPopup) {
-		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		cell.style.cursor = "move";
-	}
-	this.tooltips = cell;
-
-	div = Calendar.createElement("div", this.element);
-	this.monthsCombo = div;
-	div.className = "combo";
-	for (i = 0; i < Calendar._MN.length; ++i) {
-		var mn = Calendar.createElement("div");
-		mn.className = "label";
-		mn.month = i;
-		mn.appendChild(document.createTextNode(Calendar._MN3[i]));
-		div.appendChild(mn);
-	}
-
-	div = Calendar.createElement("div", this.element);
-	this.yearsCombo = div;
-	div.className = "combo";
-	for (i = 12; i > 0; --i) {
-		var yr = Calendar.createElement("div");
-		yr.className = "label";
-		yr.appendChild(document.createTextNode(""));
-		div.appendChild(yr);
-	}
-
-	this._init(this.mondayFirst, this.date);
-	parent.appendChild(this.element);
-};
-
-/**
-*  (RE)Initializes the calendar to the given date and style (if mondayFirst is
-*  true it makes Monday the first day of week, otherwise the weeks start on
-*  Sunday.
-*/
-Calendar.prototype._init = function (mondayFirst, date) {
-	var today = new Date();
-	var year = date.getFullYear();
-	if (year < this.minYear) {
-		year = this.minYear;
-		date.setFullYear(year);
-	} else if (year > this.maxYear) {
-		year = this.maxYear;
-		date.setFullYear(year);
-	}
-	this.mondayFirst = mondayFirst;
-	this.date = new Date(date);
-	var month = date.getMonth();
-	var mday = date.getDate();
-	var no_days = date.getMonthDays();
-	date.setDate(1);
-	var wday = date.getDay();
-	var MON = mondayFirst ? 1 : 0;
-	var SAT = mondayFirst ? 5 : 6;
-	var SUN = mondayFirst ? 6 : 0;
-	if (mondayFirst) {
-		wday = (wday > 0) ? (wday - 1) : 6;
-	}
-	var iday = 1;
-	var row = this.tbody.firstChild;
-	var MN = Calendar._MN3[month];
-	var hasToday = ((today.getFullYear() == year) && (today.getMonth() == month));
-	var todayDate = today.getDate();
-	for (var i = 0; i < 6; ++i) {
-		if (iday > no_days) {
-			row.className = "emptyrow";
-			row = row.nextSibling;
-			continue;
-		}
-		var cell = row.firstChild;
-		row.className = "daysrow";
-		for (var j = 0; j < 7; ++j) {
-			if ((!i && j < wday) || iday > no_days) {
-				cell.className = "emptycell";
-				cell = cell.nextSibling;
-				continue;
-			}
-			cell.firstChild.data = iday;
-			cell.className = "day";
-			cell.disabled = false;
-			if (typeof this.checkDisabled == "function") {
-				date.setDate(iday);
-				if (this.checkDisabled(date)) {
-					cell.className += " disabled";
-					cell.disabled = true;
-				}
-			}
-			if (!cell.disabled) {
-				cell.caldate = iday;
-				cell.ttip = "_";
-				if (iday == mday) {
-					cell.className += " selected";
-					this.currentDateEl = cell;
-				}
-				if (hasToday && (iday == todayDate)) {
-					cell.className += " today";
-					cell.ttip += Calendar._TT["PART_TODAY"];
-				}
-				if (wday == SAT || wday == SUN) {
-					cell.className += " weekend";
-				}
-			}
-			++iday;
-			((++wday) ^ 7) || (wday = 0);
-			cell = cell.nextSibling;
-		}
-		row = row.nextSibling;
-	}
-	this.title.firstChild.data = Calendar._MN[month] + ", " + year;
-	// PROFILE
-	// this.tooltips.firstChild.data = "Generated in " + ((new Date()) - today) + " ms";
-};
-
-/**
-*  Calls _init function above for going to a certain date (but only if the
-*  date is different than the currently selected one).
-*/
-Calendar.prototype.setDate = function (date) {
-	if (!date.equalsTo(this.date)) {
-		this._init(this.mondayFirst, date);
-	}
-};
-
-/** Modifies the "mondayFirst" parameter (EU/US style). */
-Calendar.prototype.setMondayFirst = function (mondayFirst) {
-	this._init(mondayFirst, this.date);
-	this._displayWeekdays();
-};
-
-/**
-*  Allows customization of what dates are enabled.  The "unaryFunction"
-*  parameter must be a function object that receives the date (as a JS Date
-*  object) and returns a boolean value.  If the returned value is true then
-*  the passed date will be marked as disabled.
-*/
-Calendar.prototype.setDisabledHandler = function (unaryFunction) {
-	this.checkDisabled = unaryFunction;
-};
-
-/** Customization of allowed year range for the calendar. */
-Calendar.prototype.setRange = function (a, z) {
-	this.minYear = a;
-	this.maxYear = z;
-};
-
-/** Calls the first user handler (selectedHandler). */
-Calendar.prototype.callHandler = function () {
-	if (this.onSelected) {
-		this.onSelected(this, this.date.print(this.dateFormat));
-	}
-};
-
-/** Calls the second user handler (closeHandler). */
-Calendar.prototype.callCloseHandler = function () {
-	if (this.onClose) {
-		this.onClose(this);
-	}
-	this.hideShowCovered();
-};
-
-/** Removes the calendar object from the DOM tree and destroys it. */
-Calendar.prototype.destroy = function () {
-	var el = this.element.parentNode;
-	el.removeChild(this.element);
-	Calendar._C = null;
-	delete el;
-};
-
-/**
-*  Moves the calendar element to a different section in the DOM tree (changes
-*  its parent).
-*/
-Calendar.prototype.reparent = function (new_parent) {
-	var el = this.element;
-	el.parentNode.removeChild(el);
-	new_parent.appendChild(el);
-};
-
-/** Shows the calendar. */
-Calendar.prototype.show = function () {
-	this.element.style.display = "block";
-	this.hideShowCovered();
-};
-
-/**
-*  Hides the calendar.  Also removes any "hilite" from the class of any TD
-*  element.
-*/
-Calendar.prototype.hide = function () {
-	var trs = this.table.getElementsByTagName("td");
-	for (var i = trs.length; i > 0; ) {
-		Calendar.removeClass(trs[--i], "hilite");
-	}
-	this.element.style.display = "none";
-};
-
-/**
-*  Shows the calendar at a given absolute position (beware that, depending on
-*  the calendar element style -- position property -- this might be relative
-*  to the parent's containing rectangle).
-*/
-Calendar.prototype.showAt = function (x, y) {
-	var s = this.element.style;
-	s.left = x + "px";
-	s.top = y + "px";
-	this.show();
-};
-
-/** Shows the calendar near a given element. */
-Calendar.prototype.showAtElement = function (el) {
-	var p = Calendar.getAbsolutePos(el);
-
-	var cw = 190;
-	var ch = -200;
-
-	if (Calendar.is_ie)
-	{
-		var posX = getWndX(el) + el.offsetWidth + 18; if (posX + ch > document.body.scrollLeft + document.body.offsetWidth) posX = document.body.scrollLeft + document.body.offsetWidth - ch
-		var posY = p.y + el.offsetHeight; if (posY + cw > document.body.scrollTop + document.body.offsetHeight) posY = getWndY(el) - cw;
-		//document.body.scrollTop + document.body.offsetHeight - cw - el.offsetHeight
-		this.showAt(posX, posY);
-	}
-	else
-	{
-		// for other browsers types
-		this.showAt(getWndX(el) + el.offsetWidth + 30, p.y + el.offsetHeight-200);
-	}
-};
-
-function getWndC(object, c)
-{
-	pos = 0;
-	while (object != null)
-	{
-		pos += (c == "y") ? object.offsetTop : object.offsetLeft;
-		object = object.offsetParent;
-	}
-	return pos;
-}
-
-function getWndX(object) {return getWndC(object, "x")}
-function getWndY(object) {return getWndC(object, "y")}
-
-
-/** Customizes the date format. */
-Calendar.prototype.setDateFormat = function (str) {
-	this.dateFormat = str;
-};
-
-/** Customizes the tooltip date format. */
-Calendar.prototype.setTtDateFormat = function (str) {
-	this.ttDateFormat = str;
-};
-
-/**
-*  Tries to identify the date represented in a string.  If successful it also
-*  calls this.setDate which moves the calendar to the given date.
-*/
-Calendar.prototype.parseDate = function (str, fmt) {
-	var y = 0;
-	var m = -1;
-	var d = 0;
-	var a = str.split(/\W+/);
-	if (!fmt) {
-		fmt = this.dateFormat;
-	}
-	var b = fmt.split(/\W+/);
-	var i = 0, j = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (b[i] == "D" || b[i] == "DD") {
-			continue;
-		}
-		if (b[i] == "j" || b[i] == "d") {
-			d = a[i];
-		}
-		if (b[i] == "n" || b[i] == "m") {
-			m = a[i]-1;
-		}
-		//      if (b[i] == "y") {
-		//         y = a[i];
-		//      }
-		if ((b[i] == "Y")||(b[i] == "y")) {
-			//      if (b[i] == "yy") {
-			if (a[i].length == 4) {
-				y = a[i];
-			}
-			else {
-				if (parseInt(a[i]) < 70) {
-					y = parseInt(a[i]) + 2000;
-				}
-				else {
-					y = parseInt(a[i]) + 1900;
-				}
-			}
-		}
-		if (b[i] == "M" || b[i] == "MM") {
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
-			}
-		}
-	}
-	if (y != 0 && m != -1 && d != 0) {
-		this.setDate(new Date(y, m, d));
-		return;
-	}
-	y = 0; m = -1; d = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (a[i].search(/[a-zA-Z]+/) != -1) {
-			var t = -1;
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
-			}
-			if (t != -1) {
-				if (m != -1) {
-					d = m+1;
-				}
-				m = t;
-			}
-		} else if (parseInt(a[i]) <= 12 && m == -1) {
-			m = a[i]-1;
-		} else if (parseInt(a[i]) > 31 && y == 0) {
-			y = a[i];
-		} else if (d == 0) {
-			d = a[i];
-		}
-	}
-	if (y == 0) {
-		var today = new Date();
-		y = today.getFullYear();
-	}
-	if (m != -1 && d != 0) {
-		this.setDate(new Date(y, m, d));
-	}
-};
-
-Calendar.prototype.hideShowCovered = function () {
-	var tags = new Array("applet", "iframe", "select");
-	var el = this.element;
-
-	var p = Calendar.getAbsolutePos(el);
-	var EX1 = p.x;
-	var EX2 = el.offsetWidth + EX1;
-	var EY1 = p.y;
-	var EY2 = el.offsetHeight + EY1;
-
-	for (var k = tags.length; k > 0; ) {
-		var ar = document.getElementsByTagName(tags[--k]);
-		var cc = null;
-
-		for (var i = ar.length; i > 0;) {
-			cc = ar[--i];
-
-			p = Calendar.getAbsolutePos(cc);
-			var CX1 = p.x;
-			var CX2 = cc.offsetWidth + CX1;
-			var CY1 = p.y;
-			var CY2 = cc.offsetHeight + CY1;
-
-			if ((CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
-				cc.style.visibility = "visible";
-			} else {
-				cc.style.visibility = "hidden";
-			}
-		}
-	}
-};
-
-/** Internal function; it displays the bar with the names of the weekday. */
-Calendar.prototype._displayWeekdays = function () {
-	var MON = this.mondayFirst ? 0 : 1;
-	var SUN = this.mondayFirst ? 6 : 0;
-	var SAT = this.mondayFirst ? 5 : 6;
-	var cell = this.daynames.firstChild;
-	for (var i = 0; i < 7; ++i) {
-		cell.className = "day name";
-		if (!i) {
-			cell.ttip = this.mondayFirst ? Calendar._TT["SUN_FIRST"] : Calendar._TT["MON_FIRST"];
-			cell.navtype = 100;
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-		if (i == SUN || i == SAT) {
-			Calendar.addClass(cell, "weekend");
-		}
-		cell.firstChild.data = Calendar._DN3[i + 1 - MON];
-		cell = cell.nextSibling;
-	}
-};
-
-/** Internal function.  Hides all combo boxes that might be displayed. */
-Calendar.prototype._hideCombos = function () {
-	this.monthsCombo.style.display = "none";
-	this.yearsCombo.style.display = "none";
-};
-
-/** Internal function.  Starts dragging the element. */
-Calendar.prototype._dragStart = function (ev) {
-	if (this.dragging) {
-		return;
-	}
-	this.dragging = true;
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posY = ev.clientY + window.scrollY;
-		posX = ev.clientX + window.scrollX;
-	}
-	var st = this.element.style;
-	this.xOffs = posX - parseInt(st.left);
-	this.yOffs = posY - parseInt(st.top);
-	with (Calendar) {
-		addEvent(document, "mousemove", calDragIt);
-		addEvent(document, "mouseover", stopEvent);
-		addEvent(document, "mouseup", calDragEnd);
-	}
-};
-
-// BEGIN: DATE OBJECT PATCHES
-
-/** Adds the number of days array to the Date object. */
-Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-
-/** Returns the number of days in the current month */
-Date.prototype.getMonthDays = function() {
-	var year = this.getFullYear();
-	var month = this.getMonth();
-	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
-		return 29;
-	} else {
-		return Date._MD[month];
-	}
-};
-
-/** Checks dates equality (ignores time) */
-Date.prototype.equalsTo = function(date) {
-	return ((this.getFullYear() == date.getFullYear()) &&
-	(this.getMonth() == date.getMonth()) &&
-	(this.getDate() == date.getDate()));
-};
-
-/** Prints the date in a string according to the given format. */
-Date.prototype.print = function (frm) {
-	var str = new String(frm);
-	var m = this.getMonth();
-	var d = this.getDate();
-	var y = this.getFullYear();
-	var w = this.getDay();
-	var s = new Array();
-	s["j"] = d;
-	s["d"] = (d < 10) ? ("0" + d) : d;
-	s["n"] = 1+m;
-	s["m"] = (m < 9) ? ("0" + (1+m)) : (1+m);
-	s["Y"] = y;
-	s["y"] = new String(y).substr(2, 2);
-	with (Calendar) {
-		s["D"] = _DN3[w];
-		s["DD"] = _DN[w];
-		s["M"] = _MN3[m];
-		s["MM"] = _MN[m];
-	}
-	var re = /(.*)(\W|^)(j|d|n|m|y|Y|MM|M|DD|D)(\W|$)(.*)/;
-	while (re.exec(str) != null) {
-		str = RegExp.$1 + RegExp.$2 + s[RegExp.$3] + RegExp.$4 + RegExp.$5;
-	}
-	return str;
-};
-
-// END: DATE OBJECT PATCHES
-/*</CORE>*/
-/*<LANG>*/
-Calendar._DN = new Array
-("Sunday",
-"Monday",
-"Tuesday",
-"Wednesday",
-"Thursday",
-"Friday",
-"Saturday",
-"Sunday");
-Calendar._MN = new Array
-("January",
-"February",
-"March",
-"April",
-"May",
-"June",
-"July",
-"August",
-"September",
-"October",
-"November",
-"December");
-
-// tooltips
-Calendar._TT = {};
-Calendar._TT["TOGGLE"] = "Toggle first day of week";
-Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
-Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
-Calendar._TT["GO_TODAY"] = "Go Today";
-Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
-Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
-Calendar._TT["SEL_DATE"] = "Select date";
-Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
-Calendar._TT["PART_TODAY"] = " (today)";
-Calendar._TT["MON_FIRST"] = "Display Monday first";
-Calendar._TT["SUN_FIRST"] = "Display Sunday first";
-Calendar._TT["CLOSE"] = "Close";
-Calendar._TT["TODAY"] = "Today";
-
-// date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "y-mm-dd";
-Calendar._TT["TT_DATE_FORMAT"] = "D, M d";
-/*</LANG>*/
-/*</CSS>*/
-//document.write("<style type=\"text/css\">")
-//document.write(".calendar { width: 225px; z-Index: 1; position: relative;  display: none;  border-top: 2px solid #fff;  border-right: 2px solid #000;  border-bottom: 2px solid #000;  border-left: 2px solid #fff;  font-size: 11px;  color: #000;  cursor: default;  background: #d4d0c8;  font-family: tahoma,verdana,sans-serif;}.calendar table {  width: auto; border-top: 1px solid #000;  border-right: 1px solid #fff;  border-bottom: 1px solid #fff;  border-left: 1px solid #000;  font-size: 11px;  color: #000;  cursor: default;  background: #d4d0c8;  font-family: tahoma,verdana,sans-serif;}/* Header part -- contains navigation buttons and day names. */.calendar .calendar_button { text-align: center;  padding: 1px;  border-top: 1px solid #fff;  border-right: 1px solid #000;  border-bottom: 1px solid #000;  border-left: 1px solid #fff;}.calendar thead .title { font-weight: bold;  padding: 1px;  border: 1px solid #000;  background: #848078;  color: #fff;  text-align: center;}.calendar thead .headrow { /* Row <TR> containing navigation buttons */}.calendar thead .daynames { /* Row <TR> containing the day names */}.calendar thead .name { /* Cells <TD> containing the day names */  border-bottom: 1px solid #000;  padding: 2px;  text-align: center;  background: #f4f0e8;}.calendar thead .weekend { /* How a weekend day name shows in header */  color: #f00;}.calendar thead .hilite { /* How do the buttons in header appear when hover */  border-top: 2px solid #fff;  border-right: 2px solid #000;  border-bottom: 2px solid #000;  border-left: 2px solid #fff;  padding: 0px;  background: #e4e0d8;}.calendar thead .active { /* Active (pressed) buttons in header */  padding: 2px 0px 0px 2px;  border-top: 1px solid #000;  border-right: 1px solid #fff;  border-bottom: 1px solid #fff;  border-left: 1px solid #000;  background: #c4c0b8;}/* The body part -- contains all the days in month. */.calendar tbody .day { /* Cells <TD> containing month days dates */  width: 2em;  text-align: right;  padding: 2px 4px 2px 2px;}.calendar tbody .hilite { /* Hovered cells <TD> */  padding: 1px 3px 1px 1px;  border-top: 1px solid #fff;  border-right: 1px solid #000;  border-bottom: 1px solid #000;  border-left: 1px solid #fff;}.calendar tbody .active { /* Active (pressed) cells <TD> */  padding: 2px 2px 0px 2px;  border-top: 1px solid #000;  border-right: 1px solid #fff;  border-bottom: 1px solid #fff;  border-left: 1px solid #000;}.calendar tbody .selected { /* Cell showing selected date */  font-weight: bold;  border-top: 1px solid #000;  border-right: 1px solid #fff;  border-bottom: 1px solid #fff;  border-left: 1px solid #000;  padding: 2px 2px 0px 2px;  background: #e4e0d8;}.calendar tbody .weekend { /* Cells showing weekend days */  color: #f00;}.calendar tbody .today { /* Cell showing today date */  font-weight: bold;  color: #00f;}.calendar tbody .disabled { color: #999; }.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */  visibility: hidden;}.calendar tbody .emptyrow { display: none;} .calendar tfoot .footrow { }.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */  background: #f4f0e8;  padding: 1px;  border: 1px solid #000;  background: #848078;  color: #fff;  text-align: center;}.calendar tfoot .hilite { /* Hover style for buttons in footer */  border-top: 1px solid #fff;  border-right: 1px solid #000;  border-bottom: 1px solid #000;  border-left: 1px solid #fff;  padding: 1px;  background: #e4e0d8;}.calendar tfoot .active { /* Active (pressed) style for buttons in footer */  padding: 2px 0px 0px 2px;  border-top: 1px solid #000;  border-right: 1px solid #fff;  border-bottom: 1px solid #fff;  border-left: 1px solid #000;}/* Combo boxes (menus that display months/years for direct selection) */.combo {  position: absolute;  display: none;  width: 4em;  top: 0px;  left: 0px;  cursor: default;  border-top: 1px solid #fff;  border-right: 1px solid #000;  border-bottom: 1px solid #000;  border-left: 1px solid #fff;  background: #e4e0d8;  font-size: smaller;  padding: 1px;}.combo .label {  text-align: center;  padding: 1px;}.combo .active {  background: #c4c0b8;  padding: 0px;  border-top: 1px solid #000;  border-right: 1px solid #fff;  border-bottom: 1px solid #fff;  border-left: 1px solid #000;}.combo .hilite {  background: #048;  color: #fea;}");
-//document.write(".dpContainer {display: inline;}");
-//document.write("</style>")
-/* The main calendar widget.  DIV containing a table. */
-
Index: branches/5.1.x/themes/default2009/platform/img/languages_separator.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/ic_addtofav.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/jquery/jquery.pack.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/jquery/jquery.pack.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/jquery/jquery.pack.js	(revision 0)
@@ -1,19 +0,0 @@
-/*
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
- *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
- *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
- */
-(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
-/*
- * Sizzle CSS Selector Engine - v0.9.3
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/top_baner_2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/menu-li-1-level.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/jquery/thickbox/loadingAnimation.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/my_account/my_favorites.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/my_account/my_favorites.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/my_account/my_favorites.tpl	(revision 0)
@@ -1,46 +0,0 @@
-<!--##
-<NAME>My Favorites</NAME>
-<DESC></DESC>
-<SECTION>My Account</SECTION>
-##-->
-
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_MyFavorites"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyFavorites" templates="platform/my_account/my_account,platform/my_account/my_favorites"/>
-		</div>
-		<div class="movable-element">
-			<!-- my favorites -->
-			<inp2:m_Set favorites_found="0"/>
-			<inp2:m_ModuleInclude template="elements/content_boxes/my_favorites.elm"/>
-
-			<inp2:m_if check="m_GetEquals" var="favorites_found" value="0">
-				<inp2:m_include template="platform/elements/content_boxes/no_favorites.elm"/>
-			</inp2:m_if>
-			<!-- // my favorites -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/ic_mytopics46.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/mailing_list/subscribe.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/mailing_list/subscribe.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/mailing_list/subscribe.tpl	(revision 0)
@@ -1,53 +0,0 @@
-<!--##
-<NAME>Subscribe</NAME>
-<DESC></DESC>
-<SECTION>Mailing List</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SubscribeConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element"
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SubscribeConfirm" templates="platform/mailing_list/subscribe"/>
-		</div>
-		<div class="movable-element"
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SubscribeConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_Phrase label="lu_subscribe_confirm_prompt" />
-				<br /><br />
-
-				<form method="POST" action="<inp2:m_FormAction />">
-					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes"/>" />&nbsp;
-					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
-					<input type="hidden" name="subscribe_ok_template" value="platform/mailing_list/subscribe_ok"/>
-				</form>
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/not_logged.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/lbox/prevlabel.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/categories/suggest_confirm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/categories/suggest_confirm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/categories/suggest_confirm.tpl	(revision 0)
@@ -1,52 +0,0 @@
-<!--##
-<NAME>Confirmation</NAME>
-<DESC></DESC>
-<SECTION>Platform||Suggest Category</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SuggestCategoryConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategoryConfirm" templates="platform/categories/suggest_confirm" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<!-- suggest category confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SuggestCategoryConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_SuggestCategoryConfirm"/><br /><br />
-				<a href="<inp2:c_CategoryLink template="__default__" cat_id="current" />"><inp2:c_Field name="Name"/></a>
-			</inp2:m_RenderElement>
-			<!-- // suggest category confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/search/search_results.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/search/search_results.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/search/search_results.tpl	(revision 0)
@@ -1,48 +0,0 @@
-<!--##
-<NAME>Search Results</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SearchResults"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SearchResults" templates="platform/search/search_results"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_Set items_found="0"/>
-			<inp2:m_ModuleInclude template="elements/content_boxes/search_results.elm"/>
-
-			<inp2:m_if check="m_GetEquals" var="items_found" value="0">
-				<inp2:m_include template="platform/elements/content_boxes/nothing_found.elm"/>
-			</inp2:m_if>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/mailing_list/unsubscribe.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/mailing_list/unsubscribe.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/mailing_list/unsubscribe.tpl	(revision 0)
@@ -1,53 +0,0 @@
-<!--##
-<NAME>Unsubscribe</NAME>
-<DESC>Unsubscribe from mailing list</DESC>
-<SECTION>Mailing List</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_UnsubscribeConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UnsubscribeConfirm" templates="platform/mailing_list/unsubscribe"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_UnsubscribeConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_Phrase label="lu_unsubscribe_confirm_prompt" />
-				<br /><br />
-
-				<form method="POST" action="<inp2:m_FormAction />">
-					<input class="button" name="events[u][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes"/>" />&nbsp;
-					<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
-					<input type="hidden" name="unsubscribe_ok_template" value="platform/mailing_list/unsubscribe_ok"/>
-				</form>
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/link_icon.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/txt.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/lbox/next.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/categories/suggest_category.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/categories/suggest_category.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/categories/suggest_category.tpl	(revision 0)
@@ -1,75 +0,0 @@
-<!--##
-<NAME>Suggest Category</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SuggestCategory"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategory" templates="platform/categories/suggest_category" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<!-- suggest category -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SuggestCategory"/>
-				</inp2:m_Capture>
-
-				<inp2:m_if check="c_HasPermission" permissions="CATEGORY.ADD|CATEGORY.ADD.PENDING">
-					<inp2:c_PresetFormFields/>
-					<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-					<inp2:m_if check="c_HasError" field="any">
-						<inp2:m_RenderElement name="error_message" />
-					</inp2:m_if>
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-					<form method="post" action="<inp2:m_FormAction/>">
-						<table class="form-data fullwidth">
-							<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Name" title="lu_fld_Name"/>
-							<inp2:m_RenderElement name="inp_edit_textarea" prefix="c" field="Description" cols="30" rows="5" title="lu_fld_Description" is_last="1"/>
-
-							<inp2:m_RenderElement design="inp_edit_buttons">
-								<input type="hidden" name="suggest_confirm_template" value="platform/categories/suggest_confirm"/>
-								<input type="hidden" name="suggest_pending_confirm_template" value="platform/categories/suggest_pending_confirm"/>
-								<input class="button" type="submit" name="events[c][OnCreate]" value="<inp2:m_phrase label="lu_btn_Create"/>"/>
-							</inp2:m_RenderElement>
-						</table>
-					</form>
-				<inp2:m_else/>
-					<inp2:m_phrase name="lu_text_NoSuggestCategoryPermission"/>
-				</inp2:m_if>
-			</inp2:m_RenderElement>
-			<!-- // suggest category -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/ppt.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/icon_pick.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/my_account/my_account.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/my_account/my_account.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/my_account/my_account.tpl	(revision 0)
@@ -1,78 +0,0 @@
-<!--##
-<NAME>My Account</NAME>
-<DESC>User account page</DESC>
-<SECTION>My Account</SECTION>
-##-->
-
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_MyAccount"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="my_account_element">
-<tr>
-	<td class="directory-icon">
-		<img src="<inp2:m_TemplatesBase />/<inp2:m_param name="icon_image"/>" alt="" /><br />
-	</td>
-	<td class="directory-text">
-		<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>" class="text-title"><inp2:m_Phrase name="$title"/></a>
-		<br />
-		<inp2:m_Phrase name="$description"/>
-	</td>
-</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount" templates="platform/my_account/my_account"/>
-		</div>
-		<div class="movable-element">
-			<!-- my account -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_MyAccount"/>
-				</inp2:m_Capture>
-
-				<table>
-					<inp2:m_RenderElement name="my_account_element" template="platform/my_account/my_profile" title="lu_MyProfile" description="lu_description_MyProfile" icon_image="platform/img/ic_myprofile46.gif" />
-					<inp2:m_RenderElement name="my_account_element" template="platform/my_account/my_favorites" title="lu_MyFavorites" description="lu_description_MyFavorites" icon_image="platform/img/ic_myfavorites46.gif"/>
-					<inp2:m_RenderElement name="my_account_element" template="platform/my_account/my_preferences" title="lu_MyPreferences" description="lu_description_MyPreferences" icon_image="platform/img/ic_mypreferences46.gif"/>
-
-					<inp2:m_ModuleInclude template="my_account/my_items.elm" place="contentbox" section="1"/>
-				</table>
-			</inp2:m_RenderElement>
-			<!-- // my account -->
-
-			<!-- my items -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_MyItems"/>
-				</inp2:m_Capture>
-
-				<table>
-					<inp2:m_ModuleInclude template="my_account/my_items.elm" place="contentbox" section="2"/>
-				</table>
-			</inp2:m_RenderElement>
-			<!-- // my items -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>nothing_foundnothing_foundnothing_foundnothing_foundnothing_foundnothing_found
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/no_picture.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/ic_myfriends46.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/delete_button_background.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/xls.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/top_menu_select.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/side_boxes_content.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/nlsmenuext_xml.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/nlsmenuext_xml.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/nlsmenuext_xml.js	(revision 0)
@@ -1,231 +0,0 @@
-/**
-* nlsmenuext_xml.js v.1.0
-* Copyright 2005-2007, addobject.com. All Rights Reserved
-* Author Jack Hermanto, www.addobject.com
-*/
-var $nls_ieXML=["MSXML2.DOMDocument.4.0", "MSXML2.DOMDocument.3.0", "MSXML2.DOMDocument", "Microsoft.XmlDom"];
-
-function NlsMenuUtil() {}
-var NLSMNUTIL=NlsMenuUtil.prototype;
-
-function $aonvl(v, c) { if(v)return v; else return c; };
-function $aonevl(v, c) { if(!v || v=="")return c; else return v; };
-
-NlsMenuUtil.createFromXML=function(xml) {
-  var rt=xml.documentElement;
-  var mgr=new NlsMenuManager(rt.getAttribute("id"));
-  mgr.flowOverFormElement=$aonevl(rt.getAttribute("flowoverformelement"), false);
-  mgr.defaultEffect=$aonevl(rt.getAttribute("defaulteffect"), null);
-  mgr.icPath=$aonvl(rt.getAttribute("icpath"), "");
-  mgr.memorizeSel=$aonevl(rt.getAttribute("memorizesel"), false);
-
-  var dm=rt.getElementsByTagName("menubar")[0];
-  NlsMenuUtil.createMenu(dm, mgr);
-
-  var mns=rt.getElementsByTagName("menus")[0];
-  if(mns){
-    for (var i=0;i<mns.childNodes.length;i++){
-      dm=mns.childNodes[i];
-      if(dm.nodeType!=1)continue;
-      if(dm.nodeName=="menu") {
-        NlsMenuUtil.createMenu(dm, mgr);
-      }
-    }
-  }
-  return mgr;
-};
-
-NlsMenuUtil.createMenu=function(dm, mgr, pc) {
-  var id=dm.getAttribute("id"), mn=nlsMenu[id];
-  if(mn) {
-    if(pc!==true) {
-      mn.items=new Object(); mn.srItems=[];
-      mn.useEffect(mgr.defaultEffect);
-    }
-  } else mn=(dm.nodeName=="menubar"?mgr.createMenubar(id):mgr.createMenu(id));
-  var a=dm.attributes, n, v;
-  for(var i=0;i<a.length;i++) {
-    n=a[i].nodeName; v=a[i].nodeValue;
-    switch(n) {
-      case "orient":mn.orient=v;break;
-      case "showicon":mn.showIcon=(v=="true");break;
-      case "showsubicon":mn.showSubIcon=(v=="true");break;
-      case "target":mn.target=v;break;
-      case "stlprf":mn.stlprf=v;break;
-      case "submenuic": if(v && v!="") mn.subMenuIc=eval(v); break;
-      case "icpath":mn.icPath=v;
-      case "itemspc":mn.itemSpc=v;
-      case "droponclick":if(mn.isMenubar) {mn.dropOnClick=(v=="true");}
-    };
-  }
-
-  var its=dm.getElementsByTagName("items")[0].childNodes, ic="", itm;
-  for(var i=0;i<its.length;i++) {
-    a=its[i]; if(a.nodeType!=1) continue;
-    if(a.nodeName=="separator") {mn.addSeparator(); continue;}
-    ic=a.getAttribute("ico");
-    itm=mn.addItem(a.getAttribute("id"),
-      a.childNodes[0].nodeValue,
-      $aonvl(a.getAttribute("url"),null),
-      (!ic || ic==""?null:eval(ic)),
-      (!a.getAttribute("enb")?null:a.getAttribute("enb")=="true"),
-      null, $aonvl(a.getAttribute("title"),null)
-    );
-    itm.stlprf=$aonvl(a.getAttribute("stlprf"), "");
-    itm.target=a.getAttribute("target");
-    if(itm.target=="") itm.target=null;
-    if(a.getAttribute("subid")) {
-      mn.addSubmenu(a.getAttribute("id"),
-        a.getAttribute("subid"),
-        (!a.getAttribute("crsframe")?null:a.getAttribute("crsframe")=="true"),
-        (!a.getAttribute("subframe")?null:eval(a.getAttribute("subframe"))),
-        (!a.getAttribute("subpos")?null:eval(a.getAttribute("subpos"))),
-        (!a.getAttribute("subposadj")?null:eval(a.getAttribute("subposadj"))),
-        (!a.getAttribute("subdir")?null:eval(a.getAttribute("subdir")))
-      );
-
-      if(a.getAttribute("suburl")) {
-        mn.setSubmenuUrl(a.getAttribute("id"), NlsMenuUtil.formatRequest(a.getAttribute('suburl')));
-      }
-    }
-  }
-  return mn;
-};
-
-NlsMenuUtil.createFromXMLString=function(sXml) {;
-  var xml=NlsMenuUtil.createXMLDom(sXml);
-  return NlsMenuUtil.createFromXML(xml);
-};
-
-NlsMenuUtil.createFromXMLFile=function(fName) {
-  var xmlDom=NlsMenuUtil.$createDoc();
-  xmlDom.async=false;
-  xmlDom.load(fName);
-  return NlsMenuUtil.createFromXML(xmlDom);
-};
-
-NlsMenuUtil.formatRequest = function ($url) {
-	return $url += ($url.indexOf('?') ? '&' : '?') + 'ajax=yes';
-}
-/*mCnt: menu container/placeholder*/
-NlsMenuUtil.loadFromXMLFile=function(fName, mCnt) {
-  var req=NlsMenuUtil.createXMLRequest();
-  req.open("get", NlsMenuUtil.formatRequest(fName), true);
-  req.onreadystatechange=function() {
-    if(req.readyState==4) {
-      if(req.status==200 || req.status==304) {
-        var s="";
-        var mgr=NlsMenuUtil.createFromXML(req.responseXML);
-        for (it in mgr.menus) { s+=mgr.menus[it].renderMenu(); }
-        if(s!="") NlsMenuUtil.$createMenuDom(s);
-        if(mgr.menubar) mgr.renderMenubar(mCnt);
-      }
-    }
-  };
-  req.send(null);
-}
-
-NlsMenuUtil.createXMLDom=function(sXml) {
-  var xmlDom=null;
-  if (typeof DOMParser != "undefined") {
-    var parser=new DOMParser(); //gecko browser xml dom
-    xmlDom=parser.parseFromString(sXml, "text/xml");
-  } else {
-    xmlDom=NlsMenuUtil.$createDoc();
-    xmlDom.loadXML(sXml);
-  }
-  return xmlDom;
-};
-
-NlsMenuUtil.$createDoc=function() {
-  var xmlDom=null;
-  if(nls_isIE) {
-    for (var i=0;i<$nls_ieXML.length;i++) {
-      try {
-        xmlDom=new ActiveXObject($nls_ieXML[i]);
-        break;
-      } catch (e) {}
-    }
-  } else {
-    xmlDom=document.implementation.createDocument("","",null);
-  }
-  return xmlDom;
-};
-
-NlsMenuUtil.createXMLRequest=function() {
-  if (typeof XMLHttpRequest != "undefined") { //for mozilla
-    var httpReq=new XMLHttpRequest();
-    return httpReq;
-  } else {
-    var arrObj=["MSXML2.XMLHttp.4.0", "MSXML2.XMLHttp.3.0", "MSXML2.XMLHttp", "Microsoft.XMHttp"];
-    var oXml=null;
-    for (var i=0; i<arrObj.length; i++) {
-      try {
-        oXml=new ActiveXObject(arrObj[i]);
-        return oXml;
-      } catch (e) { }
-    }
-  }
-};
-
-/*AJAX Menu*/
-NlsMnMgr.loadingText="Loading menu, please wait...";
-
-NLSMENU.addAJAXSubmenu=function(key, subId, url, crsFrame, subFrame, subPos, subPosAdj, subDir) {
-  var it=this.addSubmenu(key, subId, crsFrame, subFrame, subPos, subPosAdj, subDir);
-  this.setSubmenuUrl(key, url);
-};
-
-NLSMENU.setSubmenuUrl=function(key, url) {
-  var it=this.items[this.mId+"_"+key];
-  it.rt.subUrl=url;
-  it.rt.loaded=0;
-};
-
-NlsMenuUtil.$createMenuDom=function(s) {
-  var dv=document.createElement("div");
-  dv.innerHTML=s;
-  document.body.insertBefore(dv, document.body.childNodes[0]);
-}
-
-NlsMenuUtil.loadAJAXMenu=function(mn, it) {
-  var mgr=mn.mgr;
-  var req=NlsMenuUtil.createXMLRequest();
-  req.open("get", it.rt.subUrl, true);
-  req.onreadystatechange=function() {
-    if(req.readyState==4) {
-      if(req.status==200 || req.status==304) {
-        var de=req.responseXML.documentElement;
-
-        if(!de||de.childNodes.length==0) { //if no submenu
-        } else {
-          de=de.childNodes; var sub=null, main=null; subs=new Object(), smenu="";
-          for(var i=0;i<de.length;i++){
-            if(de[i].nodeType!=1) continue;
-            sub=NlsMenuUtil.createMenu(de[i], mn.mgr);
-            if(sub.mId==it.subMenuId) { main=sub; } else { subs[sub.mId]=sub;}
-          }
-          for (var x in subs) { smenu+=subs[x].renderMenu(); }
-          if(smenu) {NlsMenuUtil.$createMenuDom(smenu);}
-          if(main) {
-            main.prIt=it.intKey; main.reload(true);
-            if(main.rt.active)NlsMenu.$showMenu(mn, it);
-            it.rt.loaded=2;
-          }
-        }
-      }
-    }
-  };
-  var smn=mgr.createMenu(it.subMenuId); smn.effect=null;
-  smn.addItem("ajaxload", mgr.loadingText);
-  NlsMenuUtil.$createMenuDom(smn.renderMenu());
-  NlsMenu.$showMenu(mn, it);
-  it.rt.loaded=1; //loading
-  req.send(null);
-}
-
-
-
-
-
-
Index: branches/5.1.x/themes/default2009/no_permission.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/no_permission.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/no_permission.tpl	(revision 0)
@@ -1,52 +0,0 @@
-<!--##
-<NAME>No Permissions</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_NoPermission"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_NoPermission" templates="no_permission"/>
-		</div>
-		<div class="movable-element">
-			<!-- NO PERMISSION -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_NoPermission"/>
-				</inp2:m_Capture>
-				<br /><br />
-				<inp2:m_phrase name="lu_text_NoPermission"/>
-				<br /><br />
-			</inp2:m_RenderElement>
-			<!-- // NO PERMISSION -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/backgr.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/footer_blue.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/privacy.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/privacy.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/privacy.tpl	(revision 0)
@@ -1,107 +0,0 @@
-<!--##
-<NAME>Privacy Policy</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_PrivacyPolicy"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_PrivacyPolicy"/>
-				</inp2:m_Capture>
-
-				<table class="form-data fullwidth">
-				<TR><TD>
-					[Company Name] is committed to protecting your privacy and it is always our first priority. The following describes our policy regarding your personal, account and billing information.  Personal information includes, but is not limited to: your name, company name, Website address, login, address, telephone number, e-mail address, billing information, or any additional pertaining information that personally identifies you, your preferences and/or your purchasing history, and that is not otherwise publicly available. "You" means the visitor of our websites and/or our customer. "We", "us" means [Company Name].<br/><br/>
-
-					[Company Name] can modify this Privacy Policy at any time without prior notice to you by posting revised Terms on our sites.
-					<br/><br/>
-					</TD></TR>
-
-					<TR><TD>
-					<strong>1. Information Shared</strong><br/>
-
-					[Company Name] is the sole owner of the information collected on our network of Websites (list your websites). If you believe that any content on our network have been copied in a way that constitutes copyright infringement, or property rights have been violated, please contact [Email] so we can remove that content.<br/><br/>
-
-
-					[Company Name] collects personal identifiable information from our users at several different points on our Websites.  The amount and type of information that we collect from you depends on your activities, the services that we provide and your use of our Websites.  Below is an explanation of the type of information that we collect.
-					<br/><br/>
-					</TD></TR>
-
-					<TR><TD>
-					<strong>1.1 When you browse our Websites</strong></BR>
-
-						<ul>
-						    <li>IP address - We collect your IP address to keep track of our Websites traffic and for security purposes when purchasing our products and services.
-						    <li>Browser Type - We collect information about the browser you are using to help optimize our Websites for visitors.
-						    <li>Movement through our Websites - We keep track of pages you visit to help provide you with a more personalized experience.<br/>
-						    <li>Referral Websites - If you come to our Websites via a link, we collect the location of the link that referred you.
-					    </ul>
-
-
-					<strong>2. Uses of Information</strong><br/><br/>
-					</TD></TR>
-
-					<TR><TD>
-					<strong>2.1 Purpose of Use</strong><br/>
-
-					    We may use your personal and account information to provide products or services that you have requested, to respond to an inquiry you have made (sales or otherwise) and as otherwise described in this policy.<br/><br/>
-					</TD></TR>
-
-					<TR><TD>
-						<strong>2.2 Access to Personal and Account Information</strong>
-						<ul>
-							<li>We do not sell or share your personal information with vendors, marketers or any third parties outside of [Company Name].
-					    	<li>We restrict access to your personal and account information to only the selected employees of [Company Name].
-					    	<li>These employees need access to relevant information in order to provide you with services that include: customer support, accounting, technical support, etc.
-					    </ul>
-						<br/><br/>
-					</TD></TR>
-
-					<TR><TD>
-					<strong>2.3 Special Offers and Updates</strong><br/>
-						<ul>
-							<li>We may occasionally send you promotional notices.  This includes product and service information and special deals. You can sign up to receive these emails from us on our registration page.
-					    	<li>Out of respect for your privacy, we present the option not to receive these types of communications.  Please see the "Choice and Opt-out."
-					    	<li>If you become our customer, we may send you updates on important information about our company, products and services.
-					    </ul>
-					   <br/><br/>
-					</TD></TR>
-
-		    </table>
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/ic_myprofile46.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/mailing_list/subscribe_ok.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/mailing_list/subscribe_ok.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/mailing_list/subscribe_ok.tpl	(revision 0)
@@ -1,49 +0,0 @@
-<!--##
-<NAME>Subscription Confirmed</NAME>
-<DESC>Subscription confirmed to mailing list</DESC>
-<SECTION>Mailing List</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SubscribeOk"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SubscribeConfirm,lu_title_SubscribeOk" templates="platform/mailing_list/subscribe,platform/mailing_list/subscribe_ok"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SubscribeOk"/>
-				</inp2:m_Capture>
-
-				<inp2:m_Phrase label="lu_ThankForSubscribing"/>
-				<br /><br />
-
-				<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/ic_details.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/xml.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/forums_new_post.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/menu_background.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/ic_rateit.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/pagenation_left.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/styles.css
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/styles.css	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/styles.css	(revision 0)
@@ -1,642 +0,0 @@
-/* --- Golbal Usage Styles --- */
-html, body {
-	margin: 0px;
-    padding: 0px;
-    height: 100%;
-    border: none;
-	font: 9pt Arial;
-	color: #000000;
-}
-
-.fullwidth {
-	width: 100%;
-}
-
-table {
-	margin: 0px;
-	padding: 0px;
-	border-collapse: collapse;
-}
-
-td {
-	font: 11px Arial, serif;
-	color: #000000;
-	margin: 0px;
-	padding: 0px;
-}
-
-
-.hidden-element {
-	display: none;
-}
-
-.horizontal-separator {
-	background: url(../img/horizontal_dashed_line.gif) bottom repeat-x;
-}
-
-.vertical-separator {
-	background: url(../img/vertical_dashed_line.gif) top center repeat-y;
-}
-
-img, img A {
-	border: 0px;
-}
-
-form {
-	display: inline;
-}
-
-.top-background {
-	background: url(../img/top_background.gif) right repeat-y;
-}
-
-.top-baner-cell
-	{
-	padding: 10px;
-	text-align:center;
-	}
-
-.menu-background {
-	background: url(../img/menu_background.gif) top repeat-x #1865AC;
-	width: 100%;
-}
-
-.top-select-padding {
-	padding: 0px 15px;
-}
-
-.footer-table td {
-	background: url(../img/footer_blue.gif) top repeat-x;
-	height: 26px;
-	color: #F7EEE4;
-	font-size: 10px;
-	padding: 0px 10px;
-}
-
-.footer-table a {
-	color: #F7EEE4;
-}
-
-/* --- Link Styles --- */
-a {
-	color: #197ACA;
-}
-
-a:hover {
-	color: #FF9900;
-}
-
-a.more-link {
-	font-size: 10px;
-}
-
-a.item-action {
-	font-size: 9px;
-	color: #666666;
-}
-
-a.item-action:hover {
-	color: #000000;
-}
-
-.footer-links {
-	text-align: right;
-	padding: 5px 10px;
-}
-
-.footer-links A {
-	color: #333333;
-	font-size: 10px;
-}
-
-.footer-links A:hover {
-	color: #666666;
-}
-
-/* --- Side Box Styles --- */
-.side-box-header {
-	background: url(../img/side_boxes_background.gif) bottom repeat-x #83AFD6;
-	height: 29px;
-	padding: 0px 8px 0px 20px;
-}
-
-.side-box-title {
-	font-size: 12px;
-	color: #FFFFFF;
-}
-
-.side-box-title A {
-	font-size: 12px;
-	color: #FFFFFF;
-	text-decoration: underline;
-}
-
-.side-box-title A:hover {
-	font-size: 12px;
-	color: #FFDC0E;
-}
-
-.side-box-content {
-	background: url(../img/side_boxes_content.gif) top repeat-x;
-	padding: 20px 20px;
-}
-
-/* --- Content Box Styles --- */
-.content-box-header {
-	background: #F0F5FA;
-	height: 29px;
-	padding: 0px 20px;
-}
-
-.content-box-title {
-	font-size: 15px;
-	font-family: Arial;
-	color: #000000;
-	font-weight: bold;
-}
-
-.content-box-content {
-	background: #FFFFFF;
-	padding: 20px 20px 0px 20px;
-}
-
-/* --- Form Control Styles --- */
-.input-text, .input-textarea {
-	background: url(../img/input_text_background.gif) top repeat-x #FFFFFF;
-	border: 1px solid #7091B9;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-}
-
-.input-textarea {
-	overflow: auto;
-}
-
-.input-select {
-	color: #333333;
-	font-size: 11px;
-}
-
-.button {
-	background: url(../img/input_button_background.gif) bottom repeat-x #efefef;
-	border: 1px solid #688BAC;
-	padding: 0px;
-	font-size: 11px;
-	padding: 0px 5px;
-}
-
-.delete-button {
-	background: url(../img/delete_button_background.gif) bottom repeat-x #FF6D6D;
-	color: #FFFFFF;
-	border: 1px solid #CC0000;
-	padding: 0px;
-	font-size: 11px;
-	padding: 0px 5px;
-}
-
-/* --- Form Field Styles --- */
-.field-name {
-	padding: 5px 15px;
-
-	color: #2E5679;
-	font-weight: bold;
-	font-size: 11px;
-}
-
-.field-required {
-	color: #FF0000;
-}
-
-.field-hint {
-	color: #000000;
-	font-size: 10px;
-}
-
-.field-error {
-	color: #CC0000;
-	font-size: 10px;
-}
-
-.field-value {
-	padding: 6px 5px;
-}
-
-.warning-message td {
-	padding: 5px;
-	background: #FFE5E6;
-	font-size: 16px;
-}
-
-.item-categories td {
-	padding: 1px;
-}
-/* --- Login Sidebox Styles --- */
-.login-status, .login-status a {
-	font-size: 10px;
-	color: #FFFFFF;
-}
-
-.login-status a:hover {
-	font-size: 10px;
-}
-
-.remember-login {
-	color: #000000;
-	font-size: 9px;
-}
-
-/* --- Navigation Bar Styles --- */
-.navigation-bar {
-	background: url(../img/side_boxes_background.gif) bottom repeat-x #83AFD6;
-	height: 29px;
-	padding: 0px 20px;
-	font-size: 12px;
-	color: #FFFFFF;
-}
-
-.navigation-bar A {
-	color: #FFFFFF;
-}
-
-.navigation-bar A:hover {
-	color: #FFDC0E;
-}
-
-/* --- Top Right Menu Styles --- */
-.menu-top-active-icon, .menu-top-active-text {
-	background: url(../img/top_menu_select.gif);
-}
-
-td.top-menu-padding {
-	height: 37px;
-	white-space: nowrap;
-}
-
-.menu-top-noactive-icon, .menu-top-active-icon {
-	padding: 0px 5px 0px 13px;
-}
-
-.menu-top-noactive-text, .menu-top-active-text {
-	padding: 0px 13px 0px 3px;
-}
-
-a.top-menu-link, a.top-menu-link:hover {
-	font-size: 11px;
-	text-decoration: none;
-}
-
-a.top-menu-link {
-	color: #FFFFFF;
-}
-
-a.top-menu-link:hover {
-	color: #CCCCCC;
-}
-
-/* --- Tab Styles --- */
-.inactive-tab, .active-tab {
-	padding:5px 10px;
-	border: 1px solid #94c0de;
-}
-
-.inactive-tab {
-	background-color: #eff4fa;
-}
-
-.active-tab {
-	background-color: #FFFFFF;
-	border-bottom-color: #FFFFFF;
-}
-
-.tab-bottom-line {
-	background: url(../img/pixel_blue.gif) bottom repeat-x;
-}
-
-.tab-bottom-content {
-border-right:1px solid #94c0de;
-border-left:1px solid #94c0de;
-border-bottom:1px solid #94c0de;
-padding:10px;
-}
-
-.tab-left-padding {
-	padding-left: 40px;
-}
-
-/* --- Category Listing & My Account Styles --- */
-.directory-icon {
-	width: 22px;
-	vertical-align: top;
-	padding: 5px;
-}
-
-.directory-text {
-	padding: 5px 20px 5px 5px;
-	vertical-align: top;
-}
-
-/* --- Item Listing Page & Item Details Page Styles --- */
-.item-listing {
-	background: url(../img/gradient_background.gif) top repeat-x #FFFFFF;
-}
-
-.item-listing-featured {
-	background: url(../img/gradient_background_gr.gif) top repeat-x #FFFFFF;
-}
-
-.item-listing-lead {
-	background: url(../img/gradient_background_red.gif) top repeat-x #FFFFFF;
-}
-
-.item-padding {
-padding: 10px 10px 10px 10px;
-}
-
-
-
-.item-statistics {
-	font-size: 10px;
-	color: #666666;
-}
-
-.listing-field-name {
-	font-weight: bold;
-}
-
-.category-statistics {
-	font-size: 10px;
-}
-
-.category-header td {
-	padding: 5px 20px 5px 5px;
-	vertical-align: top;
-}
-
-.sub-section-header, .sub-section-header td {
-	background-color: #F4F4F4;
-	font-weight: bold;
-	padding: 5px 15px;
-	font-size: 12px;
-}
-
-.listing-row td {
-	padding: 5px 8px;
-}
-
-/* --- Pagination Bar Styles --- */
-.current-page {
-	background: #5B97CB;
-	color: #FFFFFF;
-	padding: 1px 2px;
-}
-
-a.page-link {
-	color: #000000;
-	text-decoration: none;
-}
-
-/* --- Calendar Styles --- */
-.calendar {
-	font-family: tahoma,verdana,sans-serif;
-	color: #000;
-	font-size: 11px;
-	border: 1px solid #83B2C5;
-	width: 225px;
-	position: relative;
-	z-index: 1;
-	display: none;
-	cursor: default;
-
-}
-
-.calendar table {
-	/*font-family: tahoma,verdana,sans-serif;*/
-	color: #000;
-	font-size: 11px;
-	background-color: #fefefe;
-	width: auto;
-	cursor: default;
-	border-collapse: separate;
-
-}
-
-.calendar table td {
-	padding: 2px;
-	text-align: center;
-}
-
-.calendar tbody .disabled {
-	color: #999;
-}
-
-.calendar tbody .emptyrow {
-	display: none;
-
-}
-
-.calendar tbody .today {
-	font-weight: bold;
-	background-color: #eeeeee;
-	border: 1px solid #aaaaaa !important;
-}
-
-.calendar tbody .emptycell {
-	visibility: hidden;
-}
-
-.calendar tbody .active {
-	background-color: red;
-}
-
-.calendar thead .title {
-	font-weight: bold;
-}
-
-.calendar thead .headrow {
-
-}
-
-.calendar thead .active {
-	background-color: #c4c0b8;
-	padding: 2px 0px 0px 2px;
-
-}
-
-.calendar thead .hilite {
-	background-color: #e4e0d8;
-}
-
-.calendar tfoot .title {
-	font-weight: normal;
-}
-
-.combo {  position: absolute;  display: none;  width: 4em;  top: 0px;  left: 0px;  cursor: default;  border-top: 1px solid #fff;  border-right: 1px solid #000;  border-bottom: 1px solid #000;  border-left: 1px solid #fff;  background: #e4e0d8;  font-size: smaller;  padding: 1px;}
-.combo .label {  text-align: center;  padding: 1px;}
-.combo .active {  background: #c4c0b8;  padding: 0px;  border-top: 1px solid #000;  border-right: 1px solid #fff;  border-bottom: 1px solid #fff;  border-left: 1px solid #000;}
-.combo .hilite {  background: #048;  color: #fea;}
-
-.dpContainer {
-	display: inline;
-}
-
-.list-no-squares {
-	padding: 0px;
-	list-style-type: none;
-	margin: 0px;
-}
-
-/* --- Listing Element Styles --- */
-.picture-padding {
-	padding: 20px 5px 20px 20px;
-	vertical-align: top;
-	width: 120px;
-}
-
-.text-padding {
-	padding: 20px 5px;
-}
-
-.file-list-icon
-	{
-	padding: 2px 10px 2px 0px;
-	vertical-align:top;
-	}
-
-.file-list-label
-	{
-	padding: 2px 7px 2px 0px;
-	vertical-align:top;
-	}
-
-/* --- Item Raring Styles --- */
-.ratingblock, .ratingblock div {
-	display: -moz-inline-block;
-}
-
-.voted {
-	color: #999;
-}
-
-.thanks {
-	color: #36AA3D;
-}
-
-.static {
-	color: #5D3126;
-}
-
-.inline-rating {
-	display:-moz-inline-block;
-	display:-moz-inline-box;
-	display:inline-block;
-	vertical-align: middle;
-}
-
-.star-rating,
-.star-rating a:hover,
-.star-rating a:active,
-.star-rating a:focus,
-.star-rating .current-rating{
-	background: url('../img/starrating.gif') left -1000px repeat-x;
-}
-.star-rating {
-	position:relative;
-	width:125px;
-	height:25px;
-	overflow:hidden;
-	list-style:none;
-	margin:0;
-	padding:0;
-	background-position: left top;
-}
-
-.star-rating li {
-	display: inline;
-}
-
-.star-rating a,
-.star-rating .current-rating {
-	position:absolute;
-	top:0;
-	left:0;
-	text-indent:-1000em;
-	height:25px;
-	line-height:25px;
-	outline:none;
-	overflow:hidden;
-	border: none;
-}
-
-.star-rating a:hover,
-.star-rating a:active,
-.star-rating a:focus {
-	background-position: left bottom;
-}
-.star-rating a.r1-unit { width:20%;z-index:6; }
-.star-rating a.r2-unit { width:40%;z-index:5; }
-.star-rating a.r3-unit { width:60%;z-index:4; }
-.star-rating a.r4-unit { width:80%; z-index:3; }
-.star-rating a.r5-unit { width:100%; z-index:2; }
-.star-rating .current-rating { z-index:1; background-position: left center; }
-
-.small-star {
-	width:50px;
-	height:10px;
-}
-.small-star, .small-star a:hover, .small-star a:active,
-.small-star a:focus, .small-star .current-rating {
-	background-image: url(star_small.gif);
-	line-height: 10px;
-	height: 10px;
-}
-
-/* --- Unprocessed Styles --- */
-.text-title {
-	font-size: 12px;
-	font-weight: bold;
-	color: #1769b5;
-}
-
-a.text-title {
-	font-size: 12px;
-	font-weight: bold;
-	color: #1769b5;
-}
-
-a.text-title:hover {
-	color: #005695;
-}
-
-/* ----- Depricated Styles ----- */
-.error {
-	color: magenta;
-}
-
-.static {
-	color: #00CC66;
-}
-
-.image_boder {
-	border: 1px solid #CDCECD;
-}
-
-.table-border {
-	border: 1px solid #EAEAEA;
-}
-
-.information-background {
-	background-color: #F6F6FF;
-}
-
-#sitemap ul {
-	margin:0 0 10px 10px;
-	padding:0 0 0 10px;
-}
-
-#sitemap ul li {
-	color: #0060BB;
-	list-style-image: none;
-	list-style-position: outside;
-	list-style-type: disc;
-	padding: 5px 0 0;
-}
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/ic_mypreferences46.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/zip.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/side_link_str.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/ic_mylinks46.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/delete.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/lbox/nextlabel.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/lbox/more_images.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/side_boxes_background.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/logo_watermark.png
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/lbox/prev.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/vertical_dashed_line.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/map_icon.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/input_button_background.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/lbox/closelabel.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/globe.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/lbox/close.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/ic_myfavorites46.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/s.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/topics_icon.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/categories/suggest_pending_confirm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/categories/suggest_pending_confirm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/categories/suggest_pending_confirm.tpl	(revision 0)
@@ -1,52 +0,0 @@
-<!--##
-<NAME>Suggestion Pending</NAME>
-<DESC></DESC>
-<SECTION>Platform||Suggest Category</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SuggestCategoryPendingConfirm"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SuggestCategoryPendingConfirm" templates="platform/categories/suggest_pending_confirm" show_category="1"/>
-		</div>
-		<div class="movable-element">
-			<!-- suggest category pending confirm -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SuggestCategoryPendingConfirm"/>
-				</inp2:m_Capture>
-
-				<inp2:m_phrase name="lu_text_SuggestCategoryPendingConfirm"/><br /><br />
-				<a href="<inp2:c_CategoryLink template="__default__" cat_id="current" />"><inp2:c_Field name="Name"/></a>
-			</inp2:m_RenderElement>
-			<!-- // suggest category pending confirm -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/icon_file.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/lbox/loading.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/gradient_background_gr.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/inc/nlsmenu.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/nlsmenu.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/nlsmenu.js	(revision 0)
@@ -1,860 +0,0 @@
-/**
-* nlsmenu.js v.2.0
-* Copyright 2005-2007, addobject.com. All Rights Reserved
-* Author Jack Hermanto, www.addobject.com
-*/
-var nlsMenu = new Object();
-var nlsMenuMgr = new Object();
-var nlsWinElmt = [];
-
-var ag0=window.navigator.userAgent;
-var nls_isIE = (ag0.indexOf("MSIE") >=0);
-var nls_isIE5 = (ag0.indexOf("MSIE 5.0") >=0);
-var nls_isSafari = (ag0.indexOf("Safari") >=0);
-var nls_isOpera = (ag0.indexOf("Opera") >=0);
-if (nls_isOpera) {nls_isIE=false; nls_isIE5=false;};
-
-function NlsMenuManager(mgr) {
-  this.mgrId = mgr;
-  this.menus = new Object();
-  this.menubar = null;
-  this.timeout = 1000;
-  this.flowOverFormElement = false;
-  this.assocMenuMgr = [];
-  this.defaultEffect=null;
-  this.icPath="";
-  this.memorizeSel=false;
-  this.rt=new Object();
-
-  this.tmId = null;
-  this.setTimeout=function(a, t) { this.tmId = window.setTimeout(a, t); };
-  this.clearTimeout=function() { if (this.tmId!=null) { window.clearTimeout(this.tmId); this.tmId=null;}};
-
-  nlsMenuMgr[mgr] = this;
-  if(nls_isIE)window.attachEvent("onload", function(){nlsMenuMgr[mgr].init();});
-
-  return this;
-};
-
-var NlsMnMgr = NlsMenuManager.prototype;
-NlsMnMgr.createMenu = function(mId) {
-  var m=new NlsMenu(mId)
-  m.mgr=this; m.mgrId=this.mgrId; m.icPath=this.icPath;
-  m.useEffect(this.defaultEffect);
-  if (this.design) { m.$menuItemClick = NlsMenu.$dsItemClick; }
-  this.menus[mId]=m;
-  return m;
-};
-
-NlsMnMgr.createMenubar = function (mbarId) {
-  if (this.menubar) alert("Menubar already exists!");
-  var m=new NlsMenubar(mbarId);
-  m.mgr=this; m.mgrId=this.mgrId; m.icPath=this.icPath;
-  if (this.design) { m.$menuItemClick = NlsMenu.$dsItemClick; }
-  this.menubar=m;
-  return m;
-};
-
-NlsMnMgr.renderMenus = function (plc) {
-  if (plc && plc!="") {
-    var d=NlsMenu.$GE(plc); var s="";
-    for (it in this.menus) { s+=this.menus[it].renderMenu(); }
-    d.innerHTML=s;
-  } else {
-    for (it in this.menus) { document.write(this.menus[it].renderMenu()); }
-  }
-};
-
-NlsMnMgr.renderMenubar = function (plc) {
-  if (this.menubar) {
-    if (plc && plc!="") {
-      NlsMenu.$GE(plc).innerHTML=this.menubar.renderMenubar();
-    } else {
-      document.write(this.menubar.renderMenubar());
-    }
-  }
-  if(this.memorizeSel) this.loadPath();
-};
-
-NlsMnMgr.hideMenus = function () {
-  for (var it in this.menus) {if (this.menus[it].rt.active) this.menus[it].hideMenu();}
-  if (this.menubar) this.menubar.hideMenu();
-};
-
-NlsMnMgr.addAssocMenuMgr = function(frm, mgrId) {
-  this.assocMenuMgr[this.assocMenuMgr.length] = [frm, mgrId];
-};
-
-NlsMnMgr.getMenu= function(mId) { return this.menus[mId]; };
-
-NlsMnMgr.init=function() {
-  if(this.menubar)this.menubar.init();
-}
-
-function listAllWinElmt() {
-  nlsWinElmt = [];
-  var arrWinEl = document.getElementsByTagName("SELECT");
-  var elm; var tmp; var x; var y;
-  for(var i=0; i<arrWinEl.length; i++) {
-    elm = arrWinEl[i]; tmp=elm; x=0; y=0;
-    while (tmp!=null) {
-      x += tmp.offsetLeft; y+=tmp.offsetTop;
-      tmp = tmp.offsetParent;
-    }
-    nlsWinElmt[nlsWinElmt.length] = {e:elm, eX1:x, eY1:y, eX2:x+elm.offsetWidth, eY2:y+elm.offsetHeight};
-  }
-};
-
-function NlsMenuItem(id, capt, url, ico, enb, xtra, subId, title, crossFrame, subFrame, subPos, subPosAdj, subDir) {
-  this.id = id;
-  this.intKey = "";
-  this.capt = capt;
-  this.url = (url==null? "" : url);
-  this.ico = (ico==null || ico=="" || ico.length==0) ? null: ico;
-  this.enable=(enb==null?true:enb);
-  this.xtra = xtra;
-  this.stlprf="";
-  this.target=null;
-  this.title=title==null?"":title;
-  this.itemEffect=null;
-  this.visible="false";
-  this.state=1;
-  this.selected=false;
-
-  this.subMenuId = (subId?subId:"");
-  this.crsFrame = (crossFrame?crossFrame:false);
-  this.subFrame = (subFrame?subFrame:null);
-  this.subPos = (subPos?subPos:[null,null]);
-  this.subPosAdj = (subPosAdj?subPosAdj:[0,0]);
-  this.subDir = (subDir?subDir:["right","down"]);
-  this.toString=function() {return "NlsMenuItem";};
-
-  this.useItemEffect=function(effName) {
-    this.itemEffect=new NlsMenuItemEffect(this.intKey, effName);
-  };
-
-  this.rt={subUrl:null,loaded:0};
-
-  return this;
-};
-
-function NlsMenuSeparator(cstSeparator) {
-  this.stlprf = "";
-  this.intKey = "";
-  this.seprt = cstSeparator!=null?cstSeparator:"";
-  this.render = function () {
-    if (this.seprt!="") return this.seprt;
-    return ("<table border=0 cellpadding=0 cellspacing=0 width='100%' height='0%'><tr>" +
-            "<td class=\""+this.stlprf+"nlsseparator\"></td>" +
-            "</tr></table>");
-  };
-
-  this.toString=function() {return "NlsMenuSeparator";};
-};
-
-function NlsCustomMenuItem(cst) {
-  this.intKey = "";
-  this.cstMenu = (cst?cst:"&nbsp;");
-  this.toString=function() {return "NlsCustomMenuItem";};
-};
-
-function NlsMenu(mId) {
-  /*private*/
-  this.lsItm=null;
-  this.mgrId = "";
-  this.mgr=null;
-  this.winElmt=null;
-  this.container=null;
-  this.customBorder=null;
-  this.shadow=new NlsMenuShadow("none", "5px", mId);
-  this.count=0;
-  this.isMenubar=false;
-  this.effect=null;
-  this.srItems=[];
-
-  this.rt={ready:true,active:false};
-
-  /*public*/
-  this.mId = mId;
-  this.items = new Object();
-  this.stlprf="";
-  this.subMenuIc=null;
-  this.target="_self";
-  this.icPath="";
-  this.itemSpc="";
-  this.stretchItem=true;
-
-  this.selection=false;
-
-  this.showIcon=false;
-  this.showSubIcon=true;
-
-  this.absWidth="";
-  this.orient="V";
-
-  this.defItmEff=null;
-  this.defPos=[0,0];
-
-  this.maxItemCol=100;
-  this.zIndex = 100;
-
-  this.wnd = window;
-  nlsMenu[mId] = this;
-  return this;
-};
-
-var NLSMENU=NlsMenu.prototype;
-
-NLSMENU.addItem = function(key, capt, url, ico, enb, xtra, subId, title) {
-  var intKey = this.mId+"_"+key;
-  var it = new NlsMenuItem(key, capt, url, ico, enb, xtra, subId, title);
-  it.intKey = intKey;
-  it.mId=this.mId;
-  this.items[intKey]=it;
-  this.srItems[this.srItems.length]=it;
-  if (this.defItmEff!=null && typeof(NlsMenuItemEffect) != "undefined") { it.useItemEffect(this.defItmEff); }
-  this.count++;
-  return it;
-};
-
-NLSMENU.addSeparator = function(separator) {
-  var intKey = "sep_"+this.count;
-  var it = (separator ? separator : new NlsMenuSeparator());
-  it.stlprf = this.stlprf;
-  it.intKey = intKey;
-  this.items[intKey] = it;
-  this.srItems[this.srItems.length]=it;
-  this.count++;
-  return it;
-};
-
-NLSMENU.addSubmenu = function(key, subId, crsFrame, subFrame, subPos, subPosAdj, subDir) {
-  var intKey = this.mId+"_"+key;
-  var it = this.items[intKey];
-  it.subMenuId=subId;
-  it.subFrame=(subFrame?subFrame:null);
-  it.crsFrame=(crsFrame?crsFrame:false);
-  it.subPos = (subPos?subPos:[null,null]);
-  it.subPosAdj = (subPosAdj?subPosAdj:[0,0]);
-  it.subDir = (subDir?subDir:["right","down"]);
-  return it;
-};
-
-NLSMENU.addCustomMenu = function (custom) {
-  var intKey = "cst_"+this.count;
-  var it = new NlsCustomMenuItem(custom);
-  it.intKey = intKey;
-  this.items[intKey] = it;
-  this.srItems[this.srItems.length]=it;
-  this.count++;
-  return it;
-};
-
-NLSMENU.getItemById = function (key) {
-  return this.items[this.mId+"_"+key];
-};
-
-NLSMENU.setItemStyle = function (key, stlprf) {
-  var intKey = this.mId+"_"+key;
-  var mnItem = this.items[intKey];
-  mnItem.stlprf=stlprf;
-};
-
-NLSMENU.setItemText = function (key, tx) {
-  var intKey = this.mId+"_"+key;
-  var mnItem = this.items[intKey];
-  mnItem.capt=tx;
-  var oD=NlsMenu.$GE(intKey+"x2");
-  if (oD) oD.innerHTML=tx;
-}
-
-NLSMENU.enableItem = function (key, b) {
- var it = this.items[this.mId+"_"+key] ;
- it.enable=b;
- setMnStyle(NlsMenu.$GE(it.intKey), (b?(it.selected?"S":"N"):"D"), NlsMenu.getPrf(it, this));
- setMnIcon(this, it, "N");
-};
-
-NLSMENU.dropShadow = function (pos, offset) {
-  if (this.shadow) { this.shadow.pos=pos; this.shadow.offset=(offset?offset:"5px"); } else
-  { this.shadow=new NlsMenuShadow(pos, offset, this.mId); }
-};
-
-NLSMENU.applyBorder = function (bTop, bBottom, bLeft, bRight) {
-  if (!bTop && !bBottom && !bLeft && !bRight) {
-    this.customBorder=null;
-  } else {
-    this.customBorder=new NlsMenuBorder(bTop, bBottom, bLeft, bRight);
-  }
-};
-
-NLSMENU.useEffect = function (efN) {
-  if(efN!=null && efN!="") {
-    this.effect=new NlsMenuEffect(this.mId, efN);
-  }
-};
-
-NLSMENU.renderMenu = function() {
-  var scPath="", sbIc=null;
-  var allScs = (document.getElementsByTagName ? document.getElementsByTagName("SCRIPT"): document.scripts);
-  for (var i=0;i<allScs.length;i++) {
-    if (allScs[i].src.toLowerCase().indexOf("nlsmenu.js")>=0) { scPath=allScs[i].src.replace(/nlsmenu.js/gi, ""); }
-  }
-  if (!this.subMenuIc) { sbIc=[scPath+"img/submenu.gif", scPath+"img/submenuovr.gif"];}
-  else {sbIc=[this.icPath+this.subMenuIc[0]]; if(this.subMenuIc[1])sbIc[1]=this.icPath+this.subMenuIc[1];}
-
-  var cs="<table cellpadding='0' cellspacing='0' ";
-  var sAbs=(this.absWidth==""?"":"width='"+this.absWidth+"'");
-  var smenu="<table cellpadding='0' cellspacing='"+(this.itemSpc==""?"0":this.itemSpc)+"' width='100%'>";
-  var tmpCnt=0, prf=this.stlprf, it=null, rt=null, menu=null;
-  for (var i=0; i<this.srItems.length; i++) {
-    it=this.srItems[i];
-    menu=nlsMenu[it.subMenuId];
-    if(!it.crsFrame) {
-      if(menu)menu.prIt=it.intKey;
-      if(!menu && it.rt && !it.rt.subUrl) { it.subMenuId=""; }
-    }
-    if (it.toString()=="NlsMenuSeparator") {
-      smenu+=(this.orient=="V"?"<tr>":"");
-      smenu+=("<td class='"+this.stlprf+"nlsseparatorcontainer'>"+it.render()+"</td>");
-      smenu+=(this.orient=="V"?"</tr>":"");
-    } else
-    if (it.toString()=="NlsCustomMenuItem") {
-      smenu+=(this.orient=="V"?"<tr>":"");
-      smenu+=("<td>"+it.cstMenu+"</td>");
-      smenu+=(this.orient=="V"?"</tr>":"");
-    } else {
-      prf=NlsMenu.getPrf(it, this);
-      if (this.orient=="V") { smenu+="<tr>"; }
-      if (this.orient=="H") { if (tmpCnt==0) smenu+="<tr>"; tmpCnt++; }
-      smenu+="<td align='center' id=\""+it.intKey+"\" class=\""+prf+"nlsitemcontainer\" onmouseover=\"nlsMenuItemOver(event, '"+it.intKey+"')\" onclick=\"return nlsMenu['"+this.mId+"'].$menuItemClick(event, '"+it.intKey+"');\">";
-      smenu+=cs+(this.stretchItem?"width='100%'":"")+" height='100%'><tr style=\"cursor:pointer;\" title=\""+it.title+"\">";
-
-      if (this.showIcon) {
-        smenu+="<td id=\""+it.intKey+"x1\" class=\""+prf+"nlsiconcell\" align=\"center\" nowrap>";
-          if(it.ico) {
-            if(it.ico[0]) smenu+="<img id=\"ic_"+it.intKey+"\" "+(it.enable?"":"style='display:none'")+" src=\""+this.icPath+it.ico[0]+"\">";
-            if(it.ico[1]) smenu+="<img id=\"icovr_"+it.intKey+"\" style='display:none' src=\""+this.icPath+it.ico[1]+"\">";
-            if(it.ico[2]) smenu+="<img id=\"icdis_"+it.intKey+"\" "+(!it.enable?"":"style='display:none'")+" src=\""+this.icPath+it.ico[2]+"\">";
-          }
-        smenu+="</td>";
-      }
-
-      smenu+="<td align='left' id=\""+it.intKey+"x2\" class=\""+prf+(it.enable?"nlsitem\"":"nlsitemdisable\"")+" nowrap>"+it.capt+"</td>";
-      if (this.showSubIcon && it.subMenuId!="")  { smenu+="<td id=\""+it.intKey+"x3\" class=\""+prf+"nlssubmenucell\" align=\"center\" nowrap>"+ (it.subMenuId!=""? "<img id='subic_"+it.intKey+"' src=\""+sbIc[0]+"\">" + (sbIc.length>1?"<img id='subicovr_"+it.intKey+"' style='display:none' src=\""+sbIc[1]+"\">":"") :"") +"</td>"; }
-      smenu+="</tr></table>";
-      smenu+="</td>";
-      if (this.orient=="V") { smenu+="</tr>"; }
-      if (this.orient=="H" && tmpCnt==this.maxItemCol) { smenu+="</tr>"; tmpCnt=0; }
-    }
-  }
-
-  if(this.orient=="H" && tmpCnt!=0 ) {
-    if(this.srItems.length>this.maxItemCol)
-      while(++tmpCnt<=this.maxItemCol) smenu+="<td class=\""+prf+"nlsitemcontainer\">&nbsp;</td>";
-    smenu+="</tr>";
-  }
-  smenu += "</table>";
-  smenu = cs+"class='"+this.stlprf+"nlsmenu' "+ sAbs + "><tr><td>"+smenu+"</td></tr></table>";
-
-  if (this.customBorder!=null) smenu = this.customBorder.applyBorder(smenu, this.stlprf);
-  smenu = this.shadow.dropShadow(smenu);
-
-  smenu = "<div " + (nls_isIE && !this.isMenubar?"style='position:absolute;z-index:"+(this.zIndex-1)+";'":"") + ">" + smenu;
-  if (!this.isMenubar &&  nls_isIE && !nls_isIE5 && this.mgr.flowOverFormElement) {
-    smenu += "<iframe id='"+this.mId+"ifrm' scrolling='no' frameborder=0 width='1' height='1' style='position:absolute;top:0px;left:0px;z-index:-1;filter:alpha(opacity=0)' src='"+scPath+"img/blank.gif"+"'></iframe>";
-  }
-  smenu+="</div>";
-
-  if (arguments[0]=="content") return smenu;
-
-  smenu = "<div id='"+this.mId+"' style="+(this.isMenubar?"''":"'position:absolute;z-index:"+this.zIndex+";display:none;'")+" onmouseover=\"_nlsMenuItemOver('"+this.mgrId+"')\" onmouseout=\"nlsMenuItemOut('"+this.mgrId+"')\">" + smenu + "</div>";
-
-  return smenu;
-};
-
-NLSMENU.init=function() {
-  var v=this.rt.vshade; if(!v) v=NlsMenu.$GE("vshade_"+this.mId);
-  var itm=this.rt.actmn; if(!itm) itm=NlsMenu.$GE("actmn_"+this.mId);
-  if(v){
-    var o=itm.childNodes[0].offsetHeight-parseInt(this.shadow.offset);
-    if(o>=0) v.style.height=o+"px";
-  }
-  this.rt.actmn=itm;
-  this.rt.vshade=v;
-};
-
-function NlsMenuShadow(pos, offset, mId) {
-  this.pos=pos;
-  this.offset=offset;
-  this.mId=mId;
-
-  this.dropShadow = function (smenu) {
-    var mn = nlsMenu[this.mId];
-    var cs="<table cellpadding=0 cellspacing=0 ";
-    var shadow = "<div>"+cs+"id='effwin_"+this.mId+"' height='0px'>";
-    var hshadow = "<td style='padding-@@PAD:"+this.offset+";'>"+cs+"width='100%' height='5px' class='"+mn.stlprf+"horzshadow'><tr><td></td></tr></table></td>";
-    var vshadow = "<td style='padding-@@PAD:"+this.offset+";height:100%;'>"+cs+"id='vshade_"+this.mId+"' width='5px' height='100%' class='"+mn.stlprf+"vertshadow'><tr><td></td></tr></table></td>";
-    var menutd = "<td id='actmn_"+this.mId+"'>"+smenu+"</td>";
-    var cornertd = "<td class='"+mn.stlprf+"cornshadow' width='5px' height='5px'></td>";
-    var av=[vshadow.replace(/@@PAD/gi,"top"), vshadow.replace(/@@PAD/gi,"bottom")];
-    var ah=[hshadow.replace(/@@PAD/gi,"left"), hshadow.replace(/@@PAD/gi,"right")];
-    switch (this.pos) {
-      case "none":
-        shadow += "<tr>"+menutd+"</tr>";
-        break;
-      case "bottomright" :
-        shadow += "<tr>"+menutd+av[0]+"</tr>" +
-          "<tr>"+ah[0]+cornertd+"</tr>";
-        break;
-      case "bottomleft" :
-        shadow += "<tr>"+av[0]+menutd+"</tr>" +
-          "<tr>"+cornertd+ah[1]+"</tr>";
-        break;
-      case "topleft" :
-        shadow += "<tr>"+cornertd+ah[1]+"</tr>" +
-          "<tr>"+av[1]+menutd+"</tr>";
-        break;
-      case "topright" :
-        shadow += "<tr>"+ah[0]+cornertd+"</tr>" +
-          "<tr>"+menutd+av[1]+"</tr>";
-        break;
-    }
-    return shadow + "</table></div>";
-  };
-};
-
-NLSMENU.showMenu = function(x1, y1, x2, y2, mnOrient, subDir, subAdj) {
-  this.mgr.clearTimeout();
-
-  if(this.menuOnShow(this.mId)==false)return;
-
-  var ctx = NlsMenu.$GE(this.mId);
-  if (!ctx) {
-    //create menu if not rendered.
-    var dv=document.createElement("div");
-    dv.innerHTML=this.renderMenu();
-    document.body.insertBefore(dv, document.body.childNodes[0]);
-    ctx = NlsMenu.$GE(this.mId);
-  };
-  ctx.style.visibility="hidden";
-  ctx.style.display="";
-  if(nls_isIE)this.init();
-
-  var w=window, d=document.body, de=document.documentElement;
-  var scrOffX = w.scrollX||d.scrollLeft||de.scrollLeft;
-  var scrOffY = w.scrollY||d.scrollTop||de.scrollTop;
-  var cW=w.innerWidth||d.clientWidth;
-  var cH=w.innerHeight||d.clientHeight;
-  var mW=ctx.childNodes[0].offsetWidth;
-  var mH=ctx.childNodes[0].offsetHeight;
-  var sDir=(subDir?[subDir[0], subDir[1]]:["right", "down"]);
-  var adjX=(subAdj?subAdj[0]:this.defPos[0]), adjY=(subAdj?subAdj[1]:this.defPos[1]);
-
-  var dmfrm = NlsMenu.$GE(this.mId+"ifrm");
-  if (dmfrm) {
-    var actMn = NlsMenu.$GE("actmn_"+this.mId).children[0];
-    dmfrm.width = actMn.offsetWidth;
-    dmfrm.height = actMn.offsetHeight;
-  }
-  var mX=0,mY=0;
-  if (mnOrient=="V") {
-    if (sDir[0]=="right") {
-      if(x2+mW>cW){if(x1>=mW){mX=x1-mW+adjX+scrOffX;sDir[0]="left"}else{mX=cW-mW-1+scrOffX;}}else{mX=x2+scrOffX-adjX;}
-    } else {
-      if(x1-mW<0){if(x2+mW<cW){mX=x2-adjX+scrOffX;sDir[0]="right"}else{mX=scrOffX;}}else{mX=x1-mW+adjX+scrOffX;}
-    }
-    if (sDir[1]=="down") {
-      if(y1+mH>cH){if(y2>=mH){mY=y2-mH+scrOffY-adjY;sDir[1]="up"}else{mY=cH-mH-1+scrOffY;}}else{mY=y1+scrOffY+adjY;}
-    } else {
-      if(y1-mH<0){if(y1+mH<cH){mY=y1+scrOffY-adjY;sDir[1]="down"}else{mY=scrOffY;}}else{mY=y2-mH+scrOffY-adjY;}
-    }
-  } else {
-    if (sDir[0] == "right") {
-      if(x1+mW>cW){if(x2>=mW){mX=x2-mW+scrOffX-adjX;sDir[0]="left"}else{mX=cW-mW-1+scrOffX;}}else{mX=x1+scrOffX+adjX;}
-    } else {
-      if(x2-mW<0){if(x1+mW<cW){mX=x1+scrOffX+adjX;sDir[0]="right"}else{mX=scrOffX;}}else{mX=x2-mW+scrOffX-adjX;}
-    }
-    if (sDir[1] == "down") {
-      if(y2+mH>cH){if(y1>=mH){mY=y1-mH+scrOffY+adjY;sDir[1]="up"}else{mY=cH-mH-1+scrOffY;}}else{mY=y2+scrOffY-adjY;}
-    } else {
-      if(y1-mH<0){if(y2+mH<cH){mY=y2+scrOffY-adjY;sDir[1]="down"}else{mY=scrOffY;}}else{mY=y1-mH+scrOffY+adjY;}
-    }
-  }
-
-  if (nls_isIE5 || !this.mgr.flowOverFormElement) {
-    if (this.winElmt==null) hideWinElmt(this, mX, mY, mX+mW, mY+mH);
-    if (this.winElmt==null) this.winElmt=[];
-    for(var i=0;i<this.winElmt.length;i++) {
-      this.winElmt[i].style.visibility="hidden";
-    }
-  }
-  with (ctx.style) {
-    left=mX+"px"; top=mY+"px";
-    zIndex = this.zIndex;
-    if (this.effect) {
-      with (this.effect) {prop["dir"]=sDir[(mnOrient=="V"?0:1)]; start(false); visibility="visible"; run();}
-    } else { visibility="visible"; }
-  }
-  this.rt.active=true;
-};
-
-function hideWinElmt(mn, mX1, mY1, mX2, mY2) {
-  var oe;
-  for (var i=0; i<nlsWinElmt.length; i++) {
-    oe = nlsWinElmt[i];
-    if ((oe.eX1>=mX1 && oe.eX1<=mX2 && oe.eY1>=mY1 && oe.eY1<=mY2) ||
-        (oe.eX1>=mX1 && oe.eX1<=mX2 && oe.eY2>=mY1 && oe.eY2<=mY2) ||
-        (oe.eX2>=mX1 && oe.eX2<=mX2 && oe.eY1>=mY1 && oe.eY1<=mY2) ||
-        (oe.eX2>=mX1 && oe.eX2<=mX2 && oe.eY2>=mY1 && oe.eY2<=mY2) ||
-        (mX1>=oe.eX1 && mX1<=oe.eX2 && mY1>=oe.eY1 && mY1<=oe.eY2) ||
-        (mX1>=oe.eX1 && mX1<=oe.eX2 && mY2>=oe.eY1 && mY2<=oe.eY2) ||
-        (mX2>=oe.eX1 && mX2<=oe.eX2 && mY1>=oe.eY1 && mY1<=oe.eY2) ||
-        (mX2>=oe.eX1 && mX2<=oe.eX2 && mY2>=oe.eY1 && mY2<=oe.eY2) ||
-        (oe.eX1<mX1 && oe.eX2>mX2 && oe.eY1>=mY1 && oe.eY1<=mY2) ||
-        (oe.eX1<mX1 && oe.eX2>mX2 && oe.eY2>=mY1 && oe.eY2<=mY2)
-       ) {
-      if (oe.e.style.visibility!="hidden") {
-        oe.e.style.visibility="hidden";
-        if (mn.winElmt==null) mn.winElmt=[];
-        mn.winElmt[mn.winElmt.length]=oe.e;
-      }
-    }
-  }
-};
-
-NLSMENU.showMenuAbs = function(x, y) {
-  var ctx = NlsMenu.$GE(this.mId);
-  ctx.style.top=y+"px"; ctx.style.left=x+"px";
-  ctx.style.display="";
-  this.rt.active=true;
-};
-
-NLSMENU.hideMenu = function() {
-  var ctx = NlsMenu.$GE(this.mId);
-  if (!ctx) return;
-  if (!this.isMenubar) {
-    this.rt.active=false;
-    if (this.effect) {
-      this.effect.start(true);
-      if ((nls_isIE && this.effect.effName!="aoslide") || nls_isOpera && this.effect.effName!="aoslide") {ctx.style.visibility="hidden";} else { this.effect.onHide=function() {ctx.style.visibility="hidden";}; };
-      this.effect.run();
-    } else { ctx.style.visibility="hidden"; }
-
-    this.menuOnHide(this.mId);
-  } else {
-    this.isMenuOpened = false;
-  }
-
-  if (this.lsItm!=null) {
-    var it=this.items[this.lsItm.id];
-    if(it.state!=2 && !it.selected) {
-      setMnStyle(this.lsItm, (it.enable?"N":"D"), NlsMenu.getPrf(it, this));
-      setMnIcon(this, it, "N");
-    }
-    this.lsItm=null;
-  }
-  if (this.winElmt!=null && this.winElmt.length>0) {
-    for (i=0;i<this.winElmt.length;i++) {
-      this.winElmt[i].style.visibility = "visible";
-    }
-  }
-  if (typeof(window.status)!="undefined") window.status="";
-};
-
-NLSMENU.hasSubmenu=function(key) {
-  var it=this.items[this.mId+"_"+key];
-  if(!it.crsFrame) {return(nlsMenu[it.subMenuId]);} else {
-    return it.subFrame.nlsGetMenu(it.subMenuId);
-  }
-};
-
-function $itemClick(mn, it) {
-  var mnMgr = nlsMenuMgr[mn.mgrId];
-  mnMgr.hideMenus();
-  var assMgr = mnMgr.assocMenuMgr;
-  if ( assMgr && assMgr.length > 0) {
-    for (var i=0;i<assMgr.length;i++) { assMgr[i][0].hideAllNlsMenu(); }
-  }
-
-  var trgt=it.target;
-  if (trgt==null) trgt=mn.target!=null?mn.target:"_self";
-  if (it.url!="") {
-    window.open(it.url, trgt);
-  } else {
-    return mn.menuOnClick(mn.mId, it.id);
-  }
-};
-
-NLSMENU.$menuItemClick = function(e, itemId) {
-  if (!this.items[itemId].enable) return;
-
-  var it=this.items[itemId], prf=NlsMenu.getPrf(it, this);
-  var oIt = NlsMenu.$GE(itemId), mgr=this.mgr;
-
-  // we need to preload AJAX menu here, otherwise hasSubmenu below returns false ~Kostja
-  if (this.isMenubar && this.dropOnClick && it.rt.subUrl && it.rt.loaded==0) {
-    //ajax menu
-    NlsMenuUtil.loadAJAXMenu(this,it);
-  }
-
-  if(this.isMenubar && this.dropOnClick && this.hasSubmenu(it.id) && !this.isMenuOpened) { // Kostja: added !this.isMenuOpened, otherwise there is no way to go to menu item URL ~Kostja
-    if(!this.isMenuOpened) {
-      NlsMenu.showMenu(this, it);
-      this.isMenuOpened = true;
-    } else { // we'll never get here, see above ~Kostja
-      mgr.hideMenus();
-      setMnStyle(oIt, (it.enable ? "O" : "D"), prf);
-      setMnIcon(this, it, "O");
-      this.isMenuOpened = false;
-      return null;
-    }
-  } else {
-    if(it.toggle) {
-      this.setItemState(itemId, (it.state==1?2:1));
-    } else if(this.selection) {
-      this.setSelection(itemId, true);
-    } else if(mgr.memorizeSel) {
-      mgr.selectPath(this.mId, it.id);
-      mgr.savePath(itemId);
-    }
-    $itemClick(this, it);
-  }
-};
-
-NLSMENU.menuOnClick = function (menuId, itemId) {return true;};
-NLSMENU.menuOnShow = function (menuId) {return true;};
-NLSMENU.menuOnHide = function (menuId) {return true;};
-
-NLSMENU.reload = function(dh) {
-  var ef=this.effect;
-  if(ef) { ef.elm=null; ef.prop["init"]=false; }
-  this.lsItm=null;
-  if(dh!=true) this.mgr.hideMenus();
-  var m=NlsMenu.$GE(this.mId);
-  m.innerHTML=this.renderMenu("content");
-};
-
-function setMnIcon(mn, mnItm, f) {
-  var tf=(mnItm.enable?f:"D");
-  if (mn.showIcon && mnItm.ico && mnItm.ico.length>1) {
-    var k=mnItm.intKey;
-    var c=NlsMenu.$GE("ic_"+k), o=NlsMenu.$GE("icovr_"+k), d=NlsMenu.$GE("icdis_"+k);
-
-    c.style.display=(tf=="N"||(tf=="D" && !d)?"":"none");
-    o.style.display=(tf=="O"?"":"none");
-    if(d) d.style.display=(tf=="D"?"":"none");
-  }
-
-  if (mn.showSubIcon && mnItm.subMenuId!="") {
-    var ic=NlsMenu.$GE("subicovr_"+mnItm.intKey);
-    if(ic){
-      ic.style.display=(tf=="O"?"":"none");
-      ic=NlsMenu.$GE("subic_"+mnItm.intKey);
-      if(ic)ic.style.display=(tf=="N"||tf=="D"?"":"none");
-    }
-  }
-};
-
-function setMnStyle(it, s, prefix) {
-  var suff=(s=="O"?"over":(s=="S"?"sel":""));
-  it.className=prefix+"nlsitemcontainer"+suff;
-  var r = it.childNodes[0].rows[0], rc=null;
-  for (var i=0; i<r.cells.length; i++) {
-    rc=r.cells[i];
-    if(rc.id==it.id+"x1") rc.className=prefix+"nlsiconcell"+suff;
-    if(rc.id==it.id+"x2") rc.className=prefix+"nlsitem"+(s=="D"?"disable":suff);
-    if(rc.id==it.id+"x3") rc.className=prefix+"nlssubmenucell"+suff;
-  }
-};
-
-function nlsMenuItemOver(e, itId) {
-  var m=itId.split("_");
-  var prMenu = nlsMenu[m[0]];
-  if(prMenu.mgr.design==true)return;
-  var li = prMenu.lsItm;
-  if (!prMenu.rt.active || !prMenu.rt.ready) return;
-
-  var it=null, st="", nli=null;
-  if (li!=null) {
-    it=prMenu.items[li.id];
-    if(!it) return;
-    if(it.intKey==itId) return;
-    if(it.state!=2 && !it.selected) { /*toggle pressed*/
-      var st=NlsMenu.getPrf(it, prMenu);
-      var ef=(it.itemEffect!=null);
-      if (ef) { it.itemEffect.init(); }
-      setMnStyle(li, (it.enable ? "N" : "D"), st);
-      setMnIcon(prMenu, it, "N");
-      if (ef) { it.itemEffect.start(); }
-    }
-
-    var tmp=(it.crsFrame?it.subFrame.nlsGetMenu(it.subMenuId):nlsGetMenu(it.subMenuId));
-    while(tmp!=null) {
-      nli = null;
-      if (tmp.lsItm) {
-        it=tmp.items[tmp.lsItm.id];
-        nli = (it.crsFrame ? it.subFrame.nlsGetMenu(it.subMenuId) : tmp.wnd.nlsGetMenu(it.subMenuId));
-      }
-      tmp.hideMenu(); tmp=nli;
-    }
-  }
-
-  var oIt = NlsMenu.$GE(itId);
-  it=prMenu.items[itId];
-  if (typeof(window.status)!="undefined") window.status=it.url;
-  if(it.state!=2 && !it.selected) {
-    if (it.itemEffect!=null) { it.itemEffect.init(); }
-    setMnStyle(oIt, (it.enable ? "O" : "D"), NlsMenu.getPrf(it, prMenu));
-    setMnIcon(prMenu, it, "O");
-    if (it.itemEffect!=null) { it.itemEffect.start(); }
-  }
-
-  if (!prMenu.isMenubar ||
-      (prMenu.isMenubar && !prMenu.dropOnClick) ||
-      (prMenu.isMenubar && prMenu.dropOnClick && prMenu.isMenuOpened)) { NlsMenu.showMenu(prMenu, it); }
-
-  prMenu.lsItm=oIt;
-};
-
-function nls_getXY(oIt) {
-  var p=new Object(); p.x=0;p.y=0;p.x2=0;p.y2=0; var tmp=oIt;var d=document;
-  while(tmp) { p.x+=tmp.offsetLeft; p.y+=tmp.offsetTop; tmp=tmp.offsetParent } ;
-  p.x -= (window.scrollX||d.body.scrollLeft||d.documentElement.scrollLeft);
-  p.y -= (window.scrollY||d.body.scrollTop||d.documentElement.scrollTop);
-  if (oIt) { p.x2=p.x+oIt.offsetWidth; p.y2=p.y+oIt.offsetHeight;};
-  return p;
-};
-
-NlsMenu.showMenu=function(mn, it) {
-  if(it.rt.subUrl && it.rt.loaded==0) {
-    //ajax menu
-    NlsMenuUtil.loadAJAXMenu(mn,it);
-  } else {
-    NlsMenu.$showMenu(mn,it);
-  }
-}
-
-NlsMenu.$showMenu=function(prMenu, it) {
-  var oIt = NlsMenu.$GE(it.intKey);
-  if (it.subMenuId!="" && it.enable==true) {
-    var p=nls_getXY(oIt), smn=null;
-    if (it.crsFrame) {
-      var ps=it.subPos;
-      if (ps[0]=="REL") { } else { p.x = ps[0]; p.x2=p.x; }
-      if (ps[1]=="REL") { } else { p.y = ps[1]; p.y2=p.y; }
-      if (!it.subFrame.nlsGetMenu) return;
-      smn = it.subFrame.nlsGetMenu(it.subMenuId);
-      if (!smn) return;
-    } else {
-      smn = nlsGetMenu(it.subMenuId);
-      if (!smn) return;
-      if (smn.zIndex <= prMenu.zIndex) { smn.zIndex = prMenu.zIndex+1 }
-
-    }
-    smn.showMenu(p.x, p.y, p.x2, p.y2, prMenu.orient, it.subDir, it.subPosAdj);
-  }
-};
-
-NlsMenu.getPrf=function(it, mn) {
-  if(!it.stlprf || it.stlprf=="")return mn.stlprf; else return it.stlprf;
-}
-
-function nls_showMenu(mId, oIt, orient, subDir, subPosAdj) {
-  var sMenu = nlsGetMenu(mId);
-  if (!sMenu) { hideAllNlsMenu(); return;}
-  sMenu.mgr.clearTimeout();
-  if (sMenu.rt.active) return;
-  var p=nls_getXY(oIt);
-  sMenu.mgr.hideMenus();
-  sMenu.showMenu(p.x, p.y, p.x2, p.y2, orient, subDir, subPosAdj);
-}
-
-function nls_hideMenu(mId) {
-  var sMenu = nlsGetMenu(mId);
-  if (!sMenu) return;
-  nlsMenuItemOut(sMenu.mgrId);
-}
-
-function _nlsMenuItemOver(mgrId) {
-  var mgr = nlsMenuMgr[mgrId];
-  if(mgr.design==true) return;
-  mgr.clearTimeout();
-
-  var am = mgr.assocMenuMgr;
-  if ( am && am.length > 0) {
-    for (var i=0; i<am.length; i++) {
-      if (!am[i][0].nlsMenuMgr) continue;
-      am[i][0].nlsMenuMgr[am[i][1]].clearTimeout();
-    }
-  }
-  for (var it in nlsMenuMgr) {
-    if (it!=mgrId) {
-      nlsMenuMgr[it].hideMenus();
-    }
-  }
-};
-
-function nlsMenuItemOut(mgrId) {
-  var mnMgr = nlsMenuMgr[mgrId];
-  if(mnMgr.design==true) return;
-  mnMgr.clearTimeout();
-  mnMgr.setTimeout(function() { _nlsMenuItemOut(mgrId) }, mnMgr.timeout);
-
-  var assMgr = mnMgr.assocMenuMgr;
-  if ( assMgr && assMgr.length > 0) {
-    for (var i=0; i<assMgr.length; i++) {
-      var frm = assMgr[i];
-      if (!frm[0].nlsMenuMgr) continue;
-      frm[0].nlsMenuMgr[frm[1]].clearTimeout();
-      frm[0].nlsMenuMgr[frm[1]].setTimeout(function() { frm[0]._nlsMenuItemOut(mgrId); }, mnMgr.timeout);
-    }
-  }
-};
-
-function _nlsMenuItemOut(mgrId) {
-  nlsMenuMgr[mgrId].hideMenus();
-};
-
-function nlsGetMenu(mId) {
-  return nlsMenu[mId];
-};
-
-/*===================================================*/
-/*NlsMenuBar class*/
-/*===================================================*/
-
-NLSMENU.isMenuOpened = false;
-
-NLSMENU.dropOnClick = false;
-
-NLSMENU.renderMenubar = function () {
-  return this.renderMenu();
-};
-
-function NlsMenubar(mId) {
-  var mnBar = new NlsMenu(mId);
-  mnBar.isMenubar=true;
-  mnBar.rt.active=true;
-  return mnBar;
-};
-
-/*===================================================*/
-/*Public general methods*/
-/*===================================================*/
-
-function hideAllNlsMenu() {
-  for (it in nlsMenu) {if (nlsMenu[it].rt.active) nlsMenu[it].hideMenu();}
-};
-
-/**Cross browser related methods*/
-NlsMenu.$GE=function(id) {
-  if (document.all) {
-      return document.all(id);
-  } else
-  if (document.getElementById) {
-      return document.getElementById(id);
-  }
-};
-
-
Index: branches/5.1.x/themes/default2009/platform/inc/jquery/thickbox/thickbox.js
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/jquery/thickbox/thickbox.js	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/jquery/thickbox/thickbox.js	(revision 0)
@@ -1,467 +0,0 @@
-/*
- * Thickbox 3.1 - One Box To Rule Them All.
- * By Cody Lindley (http://www.codylindley.com)
- * Copyright (c) 2007 cody lindley
- * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
-*/
-
-// on page load call TB.init
-$(document).ready(
-	function() {
-		// pass where to apply thickbox
-		TB.init('a.thickbox, area.thickbox, input.thickbox');
-
-		// preload image
-		TB.imgLoader = new Image();
-		TB.imgLoader.src = inportalBase + 'inc/jquery/thickbox/loadingAnimation.gif';
-	}
-);
-
-function TB () {
-	this.imgLoader = null;
-	this.pathToImage = inportalBase + 'inc/jquery/thickbox/loadingAnimation.gif';
-
-	this.Width = null;
-	this.Height = null;
-}
-
-//add thickbox to href & area elements that have a class of .thickbox
-TB.init = function (domChunk) {
-	$(domChunk).click(
-		function() {
-			var t = this.title || this.name || null;
-			var a = this.href || this.alt;
-			var g = this.rel || false;
-
-			TB.show( {caption: t, url: a, imageGroup: g} );
-			this.blur();
-			return false;
-		}
-	);
-}
-
-// function called when the user clicks on a thickbox link
-TB.show = function (params) {
-
-//	caption, url, imageGroup, onDataReceived, onAfterShow, postParams
-
-	try {
-		if (typeof document.body.style.maxHeight === 'undefined') {
-			// if IE 6
-			$('body', 'html').css( {height: '100%', width: '100%'} );
-			$('html').css('overflow', 'hidden');
-
-			if (document.getElementById('TB_HideSelect') === null) {
-				// iframe to hide select elements in ie6
-				$('body').append("<iframe id='TB_HideSelect'></iframe><div id='TB_overlay'></div><div id='TB_window'></div>");
-				$('#TB_overlay').click(TB.remove);
-			}
-		} else {
-			// all others
-			if (document.getElementById('TB_overlay') === null) {
-				$('body').append("<div id='TB_overlay'></div><div id='TB_window'></div>");
-				$('#TB_overlay').click(TB.remove);
-			}
-		}
-
-		if (TB.detectMacXFF()) {
-			$('#TB_overlay').addClass('TB_overlayMacFFBGHack'); // use png overlay so hide flash
-		} else {
-			$('#TB_overlay').addClass('TB_overlayBG'); // use background and opacity
-		}
-
-		if (params.caption === null) {
-			params.caption = '';
-		}
-
-		$('body').append("<div id='TB_load'><img src='" + TB.imgLoader.src + "' /></div>"); // add loader to the page
-		$('#TB_load').show(); // show loader
-
-		var baseURL;
-		if (params.url.indexOf('?') !== -1) {
-			// ff there is a query string involved
-			baseURL = params.url.substr(0, params.url.indexOf('?'));
-		} else {
-			baseURL = params.url;
-		}
-
-		var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/;
-		var url_params = {};
-
-		if ( baseURL.toLowerCase().match(urlString) ) {
-			TB.processImages(params, urlString);
-		} else {
-			var queryString = params.url.replace(/^[^\?]+\??/,'');
-			url_params = TB.parseQuery(queryString);
-
-			TB.processDialog(params, url_params);
-		}
-
-		if (url_params['modal'] != 'true') {
-			$(document).bind(
-				'keyup',
-				function(e){
-					if (e.which == 27){
-						// close
-						TB.remove();
-					}
-				}
-			);
-		}
-	} catch(e) {
-		//nothing here
-	}
-}
-
-// helper functions below
-TB.processImages = function (params, urlString) {
-	// code to show images
-	var TB_PrevCaption = '';
-	var TB_PrevURL = '';
-	var TB_PrevHTML = '';
-	var TB_NextCaption = '';
-	var TB_NextURL = '';
-	var TB_NextHTML = '';
-	var TB_imageCount = '';
-	var TB_FoundURL = false;
-
-	if (params.imageGroup) {
-		// scan images in group to create Prev/Next links
-		var TB_TempArray = $('a[rel=' + params.imageGroup + ']').get();
-		for (var TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === '')); TB_Counter++) {
-			var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString);
-			if (!(TB_TempArray[TB_Counter].href == params.url)) {
-				if (TB_FoundURL) {
-					TB_NextCaption = TB_TempArray[TB_Counter].title;
-					TB_NextURL = TB_TempArray[TB_Counter].href;
-					TB_NextHTML = "<span id='TB_next'>&nbsp;&nbsp;<a href='#'>Next &gt;</a></span>";
-				} else {
-					TB_PrevCaption = TB_TempArray[TB_Counter].title;
-					TB_PrevURL = TB_TempArray[TB_Counter].href;
-					TB_PrevHTML = "<span id='TB_prev'>&nbsp;&nbsp;<a href='#'>&lt; Prev</a></span>";
-				}
-			} else {
-				TB_FoundURL = true;
-				TB_imageCount = 'Image ' + (TB_Counter + 1) + ' of ' + TB_TempArray.length;
-			}
-		}
-	}
-
-	var imgPreloader = new Image();
-	$(imgPreloader).bind(
-		'load',
-		function() {
-			$(this).unbind('load');
-			var $image_size = TB.scaleImage.call(TB, this);
-
-			TB.Width = $image_size.width + 30;
-			TB.Height = $image_size.height + 60;
-			$('#TB_window').append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='" + params.url + "' width='" + $image_size.width + "' height='" + $image_size.height + "' alt='" + params.caption + "'/></a>" + "<div id='TB_caption'>" + params.caption + "<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>");
-			$('#TB_closeWindowButton').click(TB.remove);
-
-			if (TB_PrevHTML !== '') {
-				function goPrev() {
-					$('#TB_window').remove();
-					$('body').append("<div id='TB_window'></div>");
-					TB.show( {caption: TB_PrevCaption, url: TB_PrevURL, imageGroup: params.imageGroup} );
-					return false;
-				}
-
-				$('#TB_prev').click(goPrev);
-			}
-
-			if (TB_NextHTML !== '') {
-				function goNext() {
-					$('#TB_window').remove();
-					$('body').append("<div id='TB_window'></div>");
-					TB.show( {caption: TB_NextCaption, url: TB_NextURL, imageGroup: params.imageGroup} );
-					return false;
-				}
-
-				$('#TB_next').click(goNext);
-
-			}
-
-			$(document).bind(
-				'keydown',
-				function(e) {
-					var keycode = e.which;
-
-					if (keycode == 27) { // close
-						TB.remove();
-					} else if (keycode == 190) {
-						// display previous image
-						if (TB_NextHTML != '') {
-							$(this).unbind('keydown');
-							goNext();
-						}
-					} else if (keycode == 188) {
-						// display next image
-						if(TB_PrevHTML != ''){
-							$(this).unbind('keydown');
-							goPrev();
-						}
-					}
-				}
-			);
-
-			// show image after it's loaded
-			TB.position();
-			$('#TB_load').remove();
-			$('#TB_ImageOff').click(TB.remove);
-			$('#TB_window').css('display', 'block'); // for safari using css instead of show
-		}
-	);
-
-	imgPreloader.src = params.url;
-}
-
-TB.scaleImage = function ($image) {
-	// resizing large images - orginal by Christian Montoya edited by me
-	var pagesize = TB.getPageSize();
-	var x = pagesize[0] - 150;
-	var y = pagesize[1] - 150;
-
-	var imageWidth = $image.width;
-	var imageHeight = $image.height;
-
-	if (imageWidth > x) {
-		imageHeight = imageHeight * (x / imageWidth);
-		imageWidth = x;
-		if (imageHeight > y) {
-			imageWidth = imageWidth * (y / imageHeight);
-			imageHeight = y;
-		}
-	} else if (imageHeight > y) {
-		imageWidth = imageWidth * (y / imageHeight);
-		imageHeight = y;
-		if (imageWidth > x) {
-			imageHeight = imageHeight * (x / imageWidth);
-			imageWidth = x;
-		}
-	}
-
-	return {width: imageWidth, height: imageHeight};
-}
-
-TB.processDialog = function (params, url_params) {
-	// code to show html
-
-	// window size is global
-	TB.Width = (url_params['width'] * 1) + 30 || 630; // defaults to 630 if no paramaters were added to URL
-	TB.Height = (url_params['height'] * 1) + 40 || 440; // defaults to 440 if no paramaters were added to URL
-
-	var ajaxContentW = TB.Width - 30;
-	var ajaxContentH = TB.Height - 45;
-
-	if (params.url.indexOf('TB_iframe') != -1) {
-		// either iframe or ajax window
-		urlNoQuery = params.url.split('TB_');
-		$('#TB_iframeContent').remove();
-
-		if (url_params['modal'] != 'true') {
-			// iframe no modal
-			$('#TB_window').append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>" + params.caption + "</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div></div><iframe frameborder='0' hspace='0' src='" + urlNoQuery[0] + "' id='TB_iframeContent' name='TB_iframeContent" + Math.round(Math.random() * 1000) + "' onload='TB.showIframe()' style='width:" + (ajaxContentW + 29) + "px;height:" + (ajaxContentH + 17) + "px;' > </iframe>");
-		}else{
-			// iframe modal
-			$('#TB_overlay').unbind();
-			$('#TB_window').append("<iframe frameborder='0' hspace='0' src='" + urlNoQuery[0] + "' id='TB_iframeContent' name='TB_iframeContent" + Math.round(Math.random() * 1000) + "' onload='TB.showIframe()' style='width:" + (ajaxContentW + 29) + "px;height:" + (ajaxContentH + 17) + "px;'> </iframe>");
-		}
-	} else {
-		// not an iframe, ajax
-		if ($('#TB_window').css('display') != 'block') {
-			if (url_params['modal'] != 'true') {
-				// ajax no modal
-				$('#TB_window').append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>" + params.caption + "</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'>close</a> or Esc Key</div></div><div id='TB_ajaxContent' style='width:" + ajaxContentW + "px;height:" + ajaxContentH + "px'></div>");
-			} else {
-				// ajax modal
-				$('#TB_overlay').unbind();
-				$('#TB_window').append("<div id='TB_ajaxContent' class='TB_modal' style='width:" + ajaxContentW + "px;height:" + ajaxContentH + "px;'></div>");
-			}
-		} else {
-			// this means the window is already up, we are just loading new content via ajax
-			$('#TB_ajaxContent')[0].style.width = ajaxContentW + 'px';
-			$('#TB_ajaxContent')[0].style.height = ajaxContentH + 'px';
-			$('#TB_ajaxContent')[0].scrollTop = 0;
-			$('#TB_ajaxWindowTitle').html(params.caption);
-		}
-	}
-
-	$('#TB_closeWindowButton').click(TB.remove);
-
-	if (params.url.indexOf('TB_inline') != -1) {
-		$('#TB_ajaxContent').html( $('#' + url_params['inlineId']).html() );
-		$('#TB_window').unload(
-			function () {
-				// move elements back when you're finished
-				$('#' + url_params['inlineId']).html( $('#TB_ajaxContent').html() );
-			}
-		);
-
-		TB.position();
-		$('#TB_load').remove();
-		$('#TB_window').css('display', 'block');
-	} else if (params.url.indexOf('TB_iframe') != -1) {
-		TB.position();
-
-		if ($.browser.safari) {
-			// safari needs help because it will not fire iframe onload
-			$('#TB_load').remove();
-			$('#TB_window').css('display', 'block');
-		}
-	} else {
-		var $content_url = params.url + '&random=' + (new Date().getTime());
-
-		if (params.postParams === undefined) {
-			$.get(
-				$content_url,
-				function ($data) {
-					TB.onDataReceived($data, params);
-				}
-			);
-		}
-		else {
-			$.post(
-				$content_url,
-				params.postParams,
-				function ($data) {
-					TB.onDataReceived($data, params);
-				}
-			);
-		}
-
-		/*$('#TB_ajaxContent').load(
-			params.url += '&random=' + (new Date().getTime()),
-			params.postParams,
-			function() {
-				//to do a post change this load method
-				TB.position();
-				$('#TB_load').remove();
-				TB.init('#TB_ajaxContent a.thickbox');
-				$('#TB_window').css('display', 'block');
-
-				if ( $.isFunction(params.showCallback) ) {
-					params.showCallback();
-				}
-			}
-		);*/
-	}
-}
-
-TB.parseRedirect = function ($data) {
-	var $match_redirect = new RegExp('^#redirect#(.*)').exec($data);
-	if ($match_redirect != null) {
-		// redirect to external template requested
-		return $match_redirect[1];
-	}
-
-	return false;
-}
-
-TB.onDataReceived = function ($data, $params) {
-	if ( $.isFunction($params.onDataReceived) ) {
-		$data = $params.onDataReceived($data);
-		if ($data === false) {
-			// this callback even could prevent redirect action
-			// callback requested to stop processing
-			return ;
-		}
-	}
-
-	var $redirect = TB.parseRedirect($data);
-	if ($redirect !== false) {
-		window.location.href = $redirect;
-		return ;
-	}
-
-	$('#TB_ajaxContent').html($data);
-
-	TB.position();
-	$('#TB_load').remove();
-	TB.init('#TB_ajaxContent a.thickbox');
-	$('#TB_window').css('display', 'block');
-
-	if ( $.isFunction($params.onAfterShow) ) {
-		$params.onAfterShow();
-	}
-}
-
-TB.showIframe = function () {
-	$('#TB_load').remove();
-	$('#TB_window').css('display', 'block');
-}
-
-TB.remove = function () {
- 	$('#TB_imageOff').unbind('click');
-	$('#TB_closeWindowButton').unbind('click');
-
-	$('#TB_window').fadeOut(
-		'fast',
-		function(){
-			$('#TB_window,#TB_overlay,#TB_HideSelect').trigger('unload').unbind().remove();
-		}
-	);
-
-	$('#TB_load').remove();
-	if (typeof document.body.style.maxHeight == 'undefined') {
-		// if IE 6
-		$('body','html').css( {height: 'auto', width: 'auto'} );
-		$('html').css('overflow', '');
-	}
-
-	$(document).unbind('keydown').unbind('keyup');
-
-	return false;
-}
-
-TB.position = function () {
-	$('#TB_window').css( {marginLeft: '-' + parseInt((TB.Width / 2), 10) + 'px', width: TB.Width + 'px'} );
-
-	if ( !(jQuery.browser.msie && jQuery.browser.version < 7)) {
-		// take away IE6
-		$('#TB_window').css( {marginTop: '-' + parseInt((TB.Height / 2), 10) + 'px'} );
-	}
-}
-
-TB.parseQuery = function (query) {
-	var Params = {};
-	if (!query) {
-		// return empty object
-		return Params;
-	}
-
-	var Pairs = query.split(/[;&]/);
-
-	for (var i = 0; i < Pairs.length; i++ ) {
-		var KeyVal = Pairs[i].split('=');
-		if (!KeyVal || KeyVal.length != 2) {
-			continue;
-		}
-
-		var key = unescape( KeyVal[0] );
-		var val = unescape( KeyVal[1] );
-		val = val.replace(/\+/g, ' ');
-		Params[key] = val;
-	}
-
-	return Params;
-}
-
-TB.getPageSize = function () {
-	var de = document.documentElement;
-	var w = window.innerWidth || self.innerWidth || (de && de.clientWidth) || document.body.clientWidth;
-	var h = window.innerHeight || self.innerHeight || (de && de.clientHeight) || document.body.clientHeight;
-
-	return [w, h];
-}
-
-TB.detectMacXFF = function () {
-	var userAgent = navigator.userAgent.toLowerCase();
-	if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox') != -1) {
-		return true;
-	}
-
-	return false;
-}
-
-
Index: branches/5.1.x/themes/default2009/platform/terms.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/terms.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/terms.tpl	(revision 0)
@@ -1,88 +0,0 @@
-<!--##
-<NAME>Terms and Conditions of Use</NAME>
-<DESC></DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_TermsAndConditions"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_TermsAndConditions"/>
-				</inp2:m_Capture>
-
-				<table class="form-data fullwidth">
-				<tr>
-					<td>
-				The services that [Company Name] provides to you are to the following Terms of Use.  You should carefully read the following Terms and Conditions. By using any Website in our Network (list your websites) you agree to be bound to the Terms of Use. [Company Name] can modify these Terms at any time without prior notice to you by posting revised Terms on our sites.<br/><br/>
-					</td>
-				</tr>
-
-				<tr>
-					<td>
-				<strong>1. Content</strong><br/>
-
-		[Company Name] provide access to a variety of resources, including developer tools, client information and case studies, communication forums and product information ("content").  Services include any updates, correspondence, enhancements, new features, and/or additions, are subject to Terms of Use.<br/><br/>
-
-				<tr>
-					<td>
-				<strong>2. Services</strong><br/>
-
-		Our Websites may contain e-mail correspondence, Forums, company news, and business related web pages specifically designed to enable you to communicate with the staff here at [Company Name].<br/><br/>
-
-				<tr>
-					<td>
-				<strong>2.1 Use of Services</strong><br/>
-
-		Services may contain e-mail correspondence, forums, company news, and business related web pages.  The customer or viewer agrees to use the Forum only to post messages and material that are appropriate.<br/><br/>
-
-		    * When browsing our Websites or using the Forums, you agree not to upload, post, transmit or make available any Content that is in violation of both U.S. and International Law, Content that is harmful, threatening, abusive, harassing,  defamatory, vulgar, obscene, invasive of another's privacy, hateful, or racially, ethnically or otherwise objectionable.<br/>
-		    * [Company Name] is not by any means obligated to monitor the Forum and will not be held responsible for any content posted onto the Forum. [Company Name] does, however, reserve the right to review, edit, modify or delete messages posted and to remove any messages at any time, without notice, for any reason whatsoever.<br/><br/>
-
-		    	<tr>
-					<td>
-				<strong>2.2 Restrictions</strong><br/>
-
-		    * The Services [Company Name] provides for you are for your personal and non-commercial use only, unless otherwise specified. The Content and Services available on our Websites is copyrighted information owned by [Company Name].<br/>
-		    * You may not: permit other individuals to use the Content and Services except under the terms listed above; duplicate or modify use of the Content and Services.<br/>
-		    * You also may not copy or sell any works or otherwise transfer rights to any of [Company Name]' information, software, products, or Content and Services obtained from our Websites.<br/>
-		    * You promise that you will not use or redistribute the Content and Services for any reason. You have no right to use the Content and Services for productive or commercial use.<br/><br/>
-		    </td>
-				</tr>
-
-		    </table>
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/top_background.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/top_baner_1.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/star_small.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/file_icons/avi.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/login/forgot_password.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/login/forgot_password.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/login/forgot_password.tpl	(revision 0)
@@ -1,109 +0,0 @@
-<!--##
-<NAME>Forgot Password</NAME>
-<DESC></DESC>
-<SECTION>My Account||Login</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ForgotPassword"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPassword" templates="platform/login/forgot_password"/>
-		</div>
-		<div class="movable-element">
-			<!-- forgot password -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ForgotPassword"/>
-				</inp2:m_Capture>
-
-				<inp2:m_if check="conf_ConfigValue" name="Email_As_Login">
-					<inp2:m_Phrase label="lu_EnterForgotEmail"/>
-				<inp2:m_else/>
-					<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
-				</inp2:m_if>
-				<br /><br />
-
-				<inp2:m_if check="u_HasError" field="any">
-					<inp2:m_RenderElement name="error_message"/>
-				</inp2:m_if>
-
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
-
-				<form method="post" action="<inp2:m_FormAction/>">
-					<table class="form-data fullwidth">
-						<inp2:m_if check="m_ConfigEquals" name="Email_As_Login" value="0">
-							<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-								<inp2:m_RenderElement name="inp_edit_field_caption" prefix="u" field="Login" title="lu_fld_Login"/>
-								<td class="field-value">
-									<inp2:m_if check="u_HasError" field="Login">
-										<span class="field-error"><inp2:u_Error field="Login"/></span><br />
-									</inp2:m_if>
-									<input type="text" class="input-text" name="username" value="<inp2:m_Get name="username"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 155px;">
-								</td>
-							</tr>
-							<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-
-							<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-								<td class="field-name"></td>
-								<td class="field-value">
-									<inp2:m_Phrase label="lu_Or"/>
-								</td>
-							</tr>
-							<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-						</inp2:m_if>
-
-						<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-							<inp2:m_RenderElement name="inp_edit_field_caption" prefix="u" field="Email" title="lu_fld_Email"/>
-							<td class="field-value">
-								<inp2:m_if check="u_HasError" field="Email">
-									<span class="field-error"><inp2:u_Error field="Email"/></span><br />
-								</inp2:m_if>
-								<input type="text" class="input-text" name="email" value="<inp2:m_Get name="email"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 155px;">
-							</td>
-						</tr>
-
-						<inp2:m_RenderElement design="inp_edit_buttons">
-							<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_notice"/>
-							<input type="hidden" name="reset_confirm_template" value="platform/login/forgot_password_reset"/>
-
-							<input type="submit" class="button" name="events[u][OnForgotPassword]" value="<inp2:m_Phrase label="lu_btn_SendPassword"/>" />
-							<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" value="<inp2:m_phrase label="lu_btn_Cancel"/>">
-						</inp2:m_RenderElement>
-					</table>
-				</form>
-			</inp2:m_RenderElement>
-			<!-- // forgot password -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/input_text_background.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/index.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/index.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/index.tpl	(revision 0)
@@ -1,58 +0,0 @@
-<!--##
-<NAME>Home</NAME>
-<DESC>Welcome page</DESC>
-<SECTION></SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_WelcomeTitle"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## /SIDE-BAR ELEMENT ##-->
-
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_WelcomeTitle"/>
-				</inp2:m_Capture>
-
-				<inp2:st_ContentBlock num="1"/>
-			</inp2:m_RenderElement>
-		</div>
-		<div class="movable-element">
-			<!--## INCLUDE HOME PAGE ELEMENTS FOR EACH MODULE ##-->
-			<inp2:m_ModuleInclude template="elements/content_boxes/home_page_items.elm" data_exists="1"/>
-			<!--## /HOME PAGE ELEMENTS ##-->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
-
-<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/login/login_pending_disabled.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/login/login_pending_disabled.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/login/login_pending_disabled.tpl	(revision 0)
@@ -1,51 +0,0 @@
-<!--##
-<NAME>Account Pending or Disabled</NAME>
-<DESC></DESC>
-<SECTION>My Account||Login</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_DisabledAccountWarning"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_DisabledAccountWarning" templates="platform/login/login_pending_disabled"/>
-		</div>
-		<div class="movable-element">
-			<!-- login pending/disabled -->
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_DisabledAccountWarning"/>
-				</inp2:m_Capture>
-
-				<inp2:m_Phrase label="lu_text_DisabledAccountWarning"/>: <a href="mailto:<inp2:u_SiteAdminEmail/>"><inp2:u_SiteAdminEmail/></a>
-			</inp2:m_RenderElement>
-			<!-- // login pending/disabled -->
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/banners/banner_top.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/banners/banner_top.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/banners/banner_top.elm.tpl	(revision 0)
@@ -1,2 +0,0 @@
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/top_baner_1.gif" width="500" height="70" alt="" /><br />
-<!--## <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/top_baner_1.gif" width="500" height="70" alt="" /><br /> ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/header.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/header.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/header.elm.tpl	(revision 0)
@@ -1,54 +0,0 @@
-<table class="top-background fullwidth">
-	<tr>
-		<td width="240" nowrap>
-			<a href="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/globe.gif" alt="<inp2:m_GetConfig name="Site_Name"/>" /><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/logo.gif" alt="<inp2:m_GetConfig name="Site_Name"/>" /></a><br />
-		</td>
-
-		<!-- TOP-BANNER -->
-		<td class="top-baner-cell">
-			<inp2:m_include template="platform/elements/banners/banner_top.elm"/>
-		</td>
-		<!-- /TOP-BANNER -->
-
-		<td width="400" align="right">
-			<table style="width:auto">
-				<tr>
-					<td class="top-select-padding">
-						<form method="post" name="lang_form" id="lang_form" action="<inp2:m_FormAction />">
-							<input type="hidden" name="events[lang][OnChangeLanguage]" value="" />
-							<inp2:m_Phrase label="lu_YourLanguage"/>:
-							<select name="language" class="input-select" onchange="document.getElementById('lang_form').submit()">
-								<inp2:m_DefineElement name="lang_elem" no_editing="1">
-									<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
-								</inp2:m_DefineElement>
-								<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
-							</select>
-						</form>
-					</td>
-
-					<!--## THEME DROP-DOWN ##-->
-					<!--##
-					<td class="top-select-padding">
-						<form method="post" name="theme_form" id="theme_form" action="<inp2:m_FormAction />">
-							<input type="hidden" name="events[theme][OnChangeTheme]" value="" />
-							<inp2:m_Phrase label="lu_CurrentTheme"/>:
-							<select name="theme" class="input-select" onchange="document.getElementById('theme_form').submit()">
-								<inp2:m_DefineElement name="theme_elem">
-									<option value="<inp2:Field name="ThemeId"/>" <inp2:m_if check="SelectedTheme">selected="selected"</inp2:m_if> ><inp2:Field name="Name"/></option>
-								</inp2:m_DefineElement>
-								<inp2:theme_PrintList render_as="theme_elem" no_table="1"/>
-							</select>
-						</form>
-					</td>
-					##-->
-					<!--## /THEME DROP-DOWN ##-->
-
-					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
-						<inp2:m_Include t="in-commerce/elements/currency_picker.elm"/>
-					</inp2:m_if>
-				</tr>
-			</table>
-
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/title_bar.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/title_bar.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/title_bar.elm.tpl	(revision 0)
@@ -1,17 +0,0 @@
-<inp2:m_DefineElement name="pagetitle_category_caption">
-	<inp2:m_if check="m_ParamEquals" name="cat_id" value="0" inverse="inverse">
-		<inp2:m_if check="m_ParamEquals" name="is_module_root" value="0">
-			<inp2:m_param name="separator"/>
-		</inp2:m_if>
-	</inp2:m_if>
-	<inp2:m_param name="cat_name"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="pagetitle_root_category">
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="pagetitle_module_root">
-	<inp2:m_param name="cat_name"/>
-</inp2:m_DefineElement>
-
-<inp2:c_CategoryPath separator=" &gt; " render_as="pagetitle_category_caption" root_cat_render_as="pagetitle_root_category" module_root_render_as="pagetitle_module_root" />
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/banners/banner_right.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/banners/banner_right.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/banners/banner_right.elm.tpl	(revision 0)
@@ -1,14 +0,0 @@
-<table style="width: 100%;">
-	<tr class="movable-header">
-		<td class="side-box-header">
-			<span class="side-box-title"><inp2:m_Phrase label="lu_title_Advertisements"/></span>
-		</td>
-	</tr>
-	<tr>
-		<td class="content-box-content">
-		<!-- Right side Banner code goes here	-->
-		Right-side Banner
-		<!-- /Right side Banner code goes here	-->
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/forms.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/forms.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/forms.elm.tpl	(revision 0)
@@ -1,514 +0,0 @@
-<inp2:m_DefineElement name="error_message">
-	<table class="warning-message fullwidth">
-		<tr>
-			<td width="30">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
-			</td>
-			<td>
-				<inp2:m_phrase name="lu_Warning"/>
-			</td>
-		</tr>
-	</table>
-	<br />
-	<inp2:m_phrase name="lu_AProblemInForm"/><br />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="subsection" break="1">
-	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-	<div class="sub-section-header"><inp2:m_Phrase label="$title"/></div>
-	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-	<inp2:m_if check="m_Param" name="break">
-		<br/>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_buttons" width="default">
-	<tr>
-		<td colspan="2">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
-		</td>
-	</tr>
-	<tr>
-		<td style="width: <inp2:m_if check="m_ParamEquals" name="width" value="default">140<inp2:m_else/><inp2:m_Param name="width"/></inp2:m_if>px">&nbsp;
-		</td>
-		<td>
-			<br />
-			<inp2:m_Param name="content"/>
-			<br /><br />
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_field_separator" no_editing="1" is_last="0">
-	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">
-	<tr>
-		<td colspan="2">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_field_caption" no_editing="1" additional_render_as="" title="">
-	<inp2:m_inc param="tab_index" by="1"/>
-	<td class="field-name" nowrap>
-		<inp2:m_if check="m_Param" name="title">
-			<label for="<inp2:{$prefix}_InputName field='$field'/>">
-				<span <inp2:m_if check="{$prefix}_HasError" field="$field">class="field-required"</inp2:m_if>>
-				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
-			</label>
-			<inp2:m_if check="m_Param" name="additional_render_as">
-				<inp2:m_RenderElement name="$additional_render_as" pass_params="1"/>
-			</inp2:m_if>
-		<inp2:m_else/>
-			&nbsp;
-		</inp2:m_if>
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_label" as_label="" currency="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_label" as_label="" currency="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="" no_editing="1" is_last="0" title="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="ml_input_element">
-	<inp2:Field name="LanguageId" result_to_var="language_id"/>
-
-	<div id="<inp2:{$prefix}_InputName field="l{$language_id}_{$field}"/>_input"<inp2:m_ifnot check="{$prefix}_LanguageVisible" field="l{$language_id}_{$field}"> style="display: none;"</inp2:m_ifnot>>
-		<inp2:m_if check="{$prefix}_HasError" field="l{$language_id}_{$field}">
-			<span class="field-error"><inp2:{$prefix}_Error field="l{$language_id}_{$field}"/></span><br/>
-		</inp2:m_if>
-
-		<div style="float: left; height: 15px; vertical-align: top; width: auto;">
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>" id="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>" value="<inp2:{$prefix}_Field field='l{$language_id}_{$field}' format='no_default'/>" tabindex="<inp2:m_get param='tab_index'/>" maxlength="<inp2:m_param name='maxlength'/>" style="<inp2:m_param name='style'/>">
-		</div>
-
-		<div style="float: left; margin-left: 3px; height: 15px; vertical-align: top; width: auto;">
-			<inp2:m_if check="Field" name="IconURL">
-				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/language_icons/<inp2:Field name='IconURL'/>" alt="<inp2:Field name='LocalName' html_escape='1'/>" border="0"/>
-			<inp2:m_else/>
-				<inp2:Field name="LocalName"/>
-			</inp2:m_if>
-		</div>
-	</div>
-	<div style="clear: both;"></div>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="field_language_element">
-	<inp2:Field name="LanguageId" result_to_var="language_id"/>
-	<a href="#" id="<inp2:{$prefix}_InputName field="l{$language_id}_{$field}"/>_flag">
-		<inp2:m_if check="Field" name="IconURL">
-			<inp2:m_if check='SelectedLanguage'>
-				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/language_icons/<inp2:Field name='IconDisabledURL'/>" alt="<inp2:Field name='LocalName' html_escape='1'/>" border="0"/>
-			<inp2:m_else/>
-				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/language_icons/<inp2:Field name='IconURL'/>" alt="<inp2:Field name='LocalName' html_escape='1'/>" border="0"/>
-			</inp2:m_if>
-		<inp2:m_else/>
-			<inp2:Field name="LocalName"/>
-		</inp2:m_if>
-	</a>
-	<inp2:m_ifnot check="m_Param" name="is_last"> </inp2:m_ifnot>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="field_languages_element">
-	<inp2:m_ifnot check="{$prefix}_HasLanguageError" field="$field">
-		<br/>
-		<inp2:lang.enabled_PrintList render_as="field_language_element" pass_params="1" strip_nl="2"/>
-	</inp2:m_ifnot>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_box_ml" style="" maxlength="" no_editing="1" is_last="0" title="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" additional_render_as="field_languages_element" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:lang.enabled_PrintList render_as="ml_input_element" pass_params="1"/>
-
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<script type="text/javascript">
-		<inp2:m_Get name="m_lang" result_to_var="current_language"/>
-		aMultiLanguageSelector.registerControl('<inp2:{$prefix}_InputName field="l{$current_language}_{$field}"/>');
-	</script>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_password" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="password" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_upload" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
-				(<inp2:{$prefix}_Field field="$field"/>)
-			</inp2:m_if>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_image_upload" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="{$prefix}_Field" name="$field">
-				<a href="<inp2:{$prefix}_ImageSrc field="$field" MaxWidth="fullsize"/>" target="_blank">
-					<inp2:{$prefix}_Image field="$field" render_as="image_element" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" align="absmiddle"/>
-				</a>
-				<br />
-				<table cellpadding="0" cellspacing="0" style="margin-top: 3px; margin-bottom: 3px;">
-					<tr>
-						<td>
-							<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
-							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
-						</td>
-						<td style="padding-left: 3px;">
-							<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="lu_btn_DeleteImage"/></label>
-						</td>
-					</tr>
-				</table>
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" /><br />
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}Alt"/>" value="<inp2:{$prefix}_Field field='{$field}Alt'/>" style="<inp2:m_param name="style"/>">
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_file_upload" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="{$prefix}_Field" name="$field">
-				<a href="<inp2:{$prefix}_DownloadFileLink field="$field"/>">
-					<inp2:{$prefix}_Field name="$field"/>
-				</a>
-				<br />
-				<table cellpadding="0" cellspacing="0">
-					<tr>
-						<td>
-							<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
-							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
-						</td>
-						<td>
-							<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="lu_btn_DeleteFile"/></label>
-						</td>
-					</tr>
-				</table>
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_hidden" db="">
-	<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="$db"/>" />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_date" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="{$field}_date"/></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-			initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
-			</script>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time" input_format="1"/>" value="" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_time" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>">&nbsp;
-			<span class="small">(<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date" input_format="1"/>" value="" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_date_time" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
-				<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-			initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
-			</script>
-			&nbsp;<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>"><span class="small"> (<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_textarea" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:{$prefix}_Field field="$field"/></textarea>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="ml_textarea_element">
-	<inp2:Field name="LanguageId" result_to_var="language_id"/>
-
-	<div id="<inp2:{$prefix}_InputName field="l{$language_id}_{$field}"/>_input"<inp2:m_ifnot check="{$prefix}_LanguageVisible" field="l{$language_id}_{$field}"> style="display: none;"</inp2:m_ifnot>>
-		<inp2:m_if check="{$prefix}_HasError" field="l{$language_id}_{$field}">
-			<span class="field-error"><inp2:{$prefix}_Error field="l{$language_id}_{$field}"/></span><br/>
-		</inp2:m_if>
-
-		<div style="float: left; vertical-align: top; width: auto;">
-			<textarea class="input-textarea" tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>" id="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>" cols="<inp2:m_param name='cols'/>" rows="<inp2:m_param name='rows'/>" style="<inp2:m_param name='style'/>"><inp2:{$prefix}_Field field="l{$language_id}_{$field}" format="no_default"/></textarea>
-		</div>
-
-		<div style="float: left; margin-left: 3px; vertical-align: top; width: auto;">
-			<inp2:m_if check="Field" name="IconURL">
-				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/language_icons/<inp2:Field name='IconURL'/>" alt="<inp2:Field name='LocalName' html_escape='1'/>" border="0"/>
-			<inp2:m_else/>
-				<inp2:Field name="LocalName"/>
-			</inp2:m_if>
-		</div>
-	</div>
-	<div style="clear: both;"></div>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_textarea_ml" style="" maxlength="" no_editing="1" is_last="0" title="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" additional_render_as="field_languages_element" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:lang.enabled_PrintList render_as="ml_textarea_element" pass_params="1"/>
-
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<script type="text/javascript">
-		<inp2:m_Get name="m_lang" result_to_var="current_language"/>
-		aMultiLanguageSelector.registerControl('<inp2:{$prefix}_InputName field="l{$current_language}_{$field}"/>');
-	</script>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_option_item">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_option_phrase">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				<inp2:m_else/>
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				</inp2:m_if>
-			</select>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_radio_item" onclick="">
-	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_radio_phrase" onclick="">
-	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
-				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked"/>
-			<inp2:m_else />
-				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_item" selected="checked"/>
-			</inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_captcha" style="" title="lu_fld_Captcha" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="Captcha" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="Captcha">
-				<span class="field-error"><inp2:{$prefix}_Error field="Captcha"/></span><br />
-			</inp2:m_if>
-			<img src="<inp2:m_Link template="platform/inc/captcha_image.elm" var="{$prefix}_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="$title"/>"/><br />
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="Captcha"/>" value="<inp2:{$prefix}_Field field="Captcha"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_Param name="style"/>">
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_checkbox" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td>
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>" />
-			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));">
-			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_categories" style="" no_editing="1" is_last="0">
-	<inp2:m_include template="platform/elements/categories.elm"/>
-
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-
-			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>_select" style="<inp2:m_param name="style"/>">
-				<option value="0"><inp2:m_Phrase name="lu_opt_SelectCategory"/></option>
-				<inp2:{$prefix}_CategorySelector render_as="selector_category_element" separator="&raquo;&nbsp;"/>
-			</select>
-
-			<input type="button" class="button" value="<inp2:m_Phrase name="lu_Add"/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name="{$prefix}_MaxCategories"/>);"/><br />
-
-			<br />
-			<table class="item-categories" id="item_categories">
-				<tbody>
-
-					<tr>
-						<td colspan="2">
-							<strong><inp2:m_Phrase name="lu_subsection_Categories"/>:</strong>
-						</td>
-					</tr>
-
-					<inp2:{$prefix}_PrintMoreCategories render_as="more_category_element" field="$field"/>
-				</tbody>
-			</table>
-			<br/>
-
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
-
-			<script type="text/javascript">
-				var $delete_button = '&nbsp;&nbsp;<input type="button" class="delete-button" value="<inp2:m_Phrase name="lu_btn_Delete"/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
-				var $phrases = ['<inp2:m_Phrase name="lu_error_CategoryLimitReached" escape="1"/>', '<inp2:m_Phrase name="lu_error_AlreadyAdded"/>'];
-				var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>, $phrases);
-			</script>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="primary_category">
-	<inp2:m_param name="separator"/> <inp2:m_param name="title"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="primary_root_category">
-	<inp2:m_RootCategoryName/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_pr_category_label" no_editing="1" is_last="0" editing="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-		<inp2:m_if check="m_Param" name="editing">
-			<inp2:{$prefix}_CategoryName />
-		<inp2:m_else />
-			<inp2:c_CategoryPath separator="&gt;" render_as="primary_category" root_cat_render_as="primary_root_category" titles="$titles" />
-		</inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/html_head.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/html_head.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/html_head.elm.tpl	(revision 0)
@@ -1,31 +0,0 @@
-
-<!--## Meta Info (Keywords and Description) ##-->
-<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
-
-<meta name="Description" content="<inp2:st_PageInfo type="meta_description"/>" />
-<meta name="Keywords" content="<inp2:st_PageInfo type="meta_keywords"/>" />
-<!--## /Meta Keywords and Description ##-->
-
-<inp2:theme.current_StylesheetFile/>
-<link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/styles.css" type="text/css" />
-
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/script.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/ajax.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/calendar.js"></script>
-
-<script type="text/javascript">var inportalBase = '<inp2:m_TemplatesBase module="In-Portal"/>';</script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery.pack.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.js"></script>
-
-<script type="text/javascript">
-	var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
-
-	<inp2:m_DefineElement name="ml_selector_language_element">
-		<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
-		<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
-	</inp2:m_DefineElement>
-
-	var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
-</script>
Index: branches/5.1.x/themes/default2009/platform/elements/pagination.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/pagination.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/pagination.elm.tpl	(revision 0)
@@ -1,52 +0,0 @@
-<inp2:m_DefineElement name="prev_page">
-	<a href="<inp2:PageLink/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/pagenation_left.gif" width="5" height="5" alt="" /></a>&nbsp;&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="next_page">
-	&nbsp;<a href="<inp2:PageLink/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/pagenation_right.gif" width="5" height="5" alt="" /></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="page_current">
-	<span class="current-page"><inp2:m_param name="page"/></span>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="page_separator">
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="page_link">
-	<a href="<inp2:PageLink/>" class="page-link"><inp2:m_param name="page"/></a>
-</inp2:m_DefineElement>
-
-<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-<br />
-
-<table style="width: 100%; text-align: left;">
-	<tr>
-		<inp2:m_if check="{$prefix}_GridInfo" type="needs_pagination">
-		<td>
-			<inp2:m_Phrase label="lu_comm_Page"/>:&nbsp;
-
-
-			<inp2:{$prefix}_PaginationBar
-					current_render_as="page_current" separator_render_as="page_separator" link_render_as="page_link"
-					prev_page_render_as="prev_page"
-					next_page_render_as="next_page" />
-		</td>
-		</inp2:m_if>
-
-		<td align="right">
-			<inp2:m_phrase name="lu_ItemsPerPage"/>:
-			<form method="post" action="<inp2:m_FormAction />">
-
-				<select class="input-select" name="<inp2:{$prefix}_VarName type="PerPage"/>">
-					<option value="10" <inp2:{$prefix}_PerPageSelected per_page="10" selected='selected="selected"'/>>10</option>
-					<option value="20" <inp2:{$prefix}_PerPageSelected per_page="20" selected='selected="selected"'/>>20</option>
-					<option value="50" <inp2:{$prefix}_PerPageSelected per_page="50" selected='selected="selected"'/>>50</option>
-				</select>
-				<input type="submit" class="button" name="<inp2:{$prefix}_SubmitName event="OnSetPerPage"/>" value="<inp2:m_Phrase label="lu_btn_Set"/>" />
-			</form>
-		</td>
-	</tr>
-</table>
-
Index: branches/5.1.x/themes/default2009/platform/elements/footer.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/footer.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/footer.elm.tpl	(revision 0)
@@ -1,15 +0,0 @@
-
-
-	<table class="fullwidth footer-table">
-		<tr>
-			<td>
-				Powered by In-portal &#174; 1997-<inp2:lang.current_CurrentDate format="Y"/>, <a href="http://www.intechnic.com" target="_blank">Intechnic Corporation</a>. <inp2:m_Phrase label="lu_AllRightsReserved"/>
-			</td>
-		</tr>
-	</table>
-
-	<div class="footer-links">
-		<a href="<inp2:m_Link template="platform/sitemap"/>"><inp2:m_Phrase label="lu_SiteMap"/></a> | <a href="<inp2:m_Link template="platform/terms"/>"><inp2:m_Phrase label="lu_TermAndCondition"/></a> | <a href="<inp2:m_Link template="platform/privacy"/>"><inp2:m_Phrase label="lu_PrivacyPolicy"/></a>
-	</div>
-
-	<inp2:m_RegisterPageHit/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/menu.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/menu.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/menu.elm.tpl	(revision 0)
@@ -1,104 +0,0 @@
-<table class="menu-background fullwidth">
-	<tr>
-		<td align="left">
-			<table style="width: auto;">
-				<tr>
-					<td>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenu.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenueffect.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_dyn.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_xml.js"></script>
-
-						<link rel="StyleSheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/dmenu.css" type="text/css" />
-						<div id="xmlMenuDiv"></div>
-
-				        <script type="text/javascript">
-				        	<inp2:m_DefineElement name="menu_xml" no_editing="1">
-										<menumgr id="mgr" flowoverformelement="false" defaulteffect="aoslide" icpath="">
-										<!--## USE droponclick="false" TO OPEN MENU ONMOUSE-OVER ##-->
-										  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_" droponclick="true" >
-										    <items>
-										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
-										    	<inp2:m_Include template="platform/elements/menu_sections.xml" />
-										    </items>
-										  </menubar>
-										</menumgr>
-				        	</inp2:m_DefineElement>
-
-				        	<inp2:m_get name="m_cat_id" result_to_var="current_category"/>
-
-				        	addLoadEvent(
-				        		function() {
-					        	 	var menu_mgr = NlsMenuUtil.createFromXMLString('<inp2:m_RenderElement name="menu_xml" js_escape="1"/>');
-//						        	menu_mgr.renderMenus();
-						        	menu_mgr.renderMenubar('xmlMenuDiv');
-					        	}
-					        );
-				        </script>
-				        <noscript>
-							<inp2:m_DefineElement name="static_top_menu_element">
-								<inp2:m_if check="m_Param" name="external_url">
-									<inp2:m_Param name="external_url" result_to_var="link"/>
-								<inp2:m_else/>
-									<inp2:m_Link template="$template" m_cat_id="$cat_id" m_cat_page="1" result_to_var="link"/>
-								</inp2:m_if>
-
-								<inp2:m_if check="m_Param" name="menu_icon">
-									<inp2:m_TemplatesBase result_to_var="module_path"/>
-									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}{$menu_icon}"/>
-								<inp2:m_else/>
-									<inp2:m_TemplatesBase module="In-Portal" result_to_var="module_path"/>
-									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_inedit.gif"/>
-								</inp2:m_if>
-							</inp2:m_DefineElement>
-
-							<table>
-								<tr>
-									<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1" result_to_var="link"/>
-									<inp2:m_RootCategoryName result_to_var="title"/>
-									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
-									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif"/>
-									<inp2:st_CachedMenu level="0" category_id="0" render_as="static_top_menu_element"/>
-								</tr>
-							</table>
-				        </noscript>
-
-				        <inp2:m_Set m_cat_id="$current_category"/>
-						<inp2:c_Field requery="1" name="Name" result_to_var="category_name"/>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<td align="right">
-			<table style="width: auto;">
-				<tr>
-					<!-- menu: My Account -->
-					<inp2:m_RenderElement design="menu_element">
-						<inp2:m_Capture to_var="menu_href">
-							<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0" m_cat_page="1"/>
-						</inp2:m_Capture>
-
-						<inp2:m_Capture to_var="menu_icon">
-							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
-						</inp2:m_Capture>
-
-						<inp2:m_Capture to_var="menu_title">
-							<inp2:m_Phrase name="lu_title_MyAccount"/>
-						</inp2:m_Capture>
-
-						<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
-					</inp2:m_RenderElement>
-					<!-- // menu: My Account -->
-
-
-					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
-					<!-- menu: ShoppingCart -->
-						<inp2:m_Include t="in-commerce/elements/menu_element.elm"/>
-					<!-- // menu: ShoppingCart -->
-					</inp2:m_if>
-
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/navigation_bar.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/navigation_bar.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/navigation_bar.elm.tpl	(revision 0)
@@ -1,38 +0,0 @@
-<inp2:m_DefaultParam titles="" templates="" show_category="0"/>
-
-<inp2:m_DefineElement name="root_category">
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_home.gif" width="9" height="9" alt=""/> <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_RootCategoryName/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="module_root">
-	<inp2:m_param name="separator"/>
-	<a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="nav_link">
-	<inp2:m_param name="separator"/>
-	<inp2:m_if check="m_Param" name="category">
-		<a href="<inp2:c_CategoryLink template="__default__" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
-	<inp2:m_else/>
-		<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="module_item">
-	<inp2:m_param name="separator"/>
-	<a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="current_item">
-	<inp2:m_param name="separator"/>
-	<span> <inp2:m_param name="title"/></span>
-</inp2:m_DefineElement>
-
-<table class="fullwidth groupItem">
-	<tr class="movable-header">
-		<td class="navigation-bar">
-			<!-- module_root_render_as="module_root" -->
-			<inp2:c_CategoryPath separator="&gt;" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" titles="$titles" templates="$templates" show_category="$show_category"/>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/side_boxes/recommend_site.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/side_boxes/recommend_site.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/side_boxes/recommend_site.elm.tpl	(revision 0)
@@ -1,16 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_RecommendSite"/>
-</inp2:m_Capture>
-
-<inp2:m_Phrase label="lu_EnterEmailToRecommend"/><br />
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
-
-<form method="POST" action="<inp2:m_FormAction />">
-	<input type="text" class="input-text" name="friend_email" value="" style="width: 155px;" /><br />
-	<inp2:m_if check="u_HasError" field="any">
-		<span class="field-error"><inp2:u_Error field="Email"/></span><br />
-	</inp2:m_if>
-	<br />
-	<input class="button" name="events[u][OnRecommend]" type="submit" value="<inp2:m_Phrase label="lu_btn_Recommend"/>" />
-	<input type="hidden" name="template_success" value="platform/recommend/recommend" />
-</form>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/side_boxes/search.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/side_boxes/search.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/side_boxes/search.elm.tpl	(revision 0)
@@ -1,51 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_SearchBox"/>
-</inp2:m_Capture>
-
-<form method="post" action="<inp2:m_Link template="platform/search/search_results" pass_category="1"/>">
-	<inp2:m_GetFormHiddens template="platform/search/search_results"/>
-	<table>
-		<tr>
-			<td colspan="2">
-				<input type="text" name="keywords" id="keywords" style="width: 155px;" class="input-text" value="" />
-			</td>
-		</tr>
-		<!--## Show only when not on home ##-->
-		<inp2:m_if check="m_GetEquals" var="m_cat_id" value="0" inverse="1">
-		<tr>
-			<td>
-				<input type="radio" name="search_scope" id="search_scope_any" value="any" checked />
-			</td>
-			<td>
-				<label for="search_scope_any"><inp2:m_Phrase name="lu_AllWebsite"/></label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<input type="radio" name="search_scope" id="search_scope_category" value="category"/>
-			</td>
-			<td>
-				<label for="search_scope_category"><inp2:m_Phrase name="lu_ThisCategory"/></label>
-			</td>
-		</tr>
-		</inp2:m_if>
-		<!--## // Show only when not on home ##-->
-	</table>
-
-	<br />
-	<input class="button" type="submit" value="<inp2:m_Phrase label="lu_btn_FindIt"/>!" />
-
-	<!--##
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
-	<table>
-		<tr>
-			<td width="10">
-				<input class="button" type="submit" style="width: 40px;" value="<inp2:m_Phrase label="lu_comm_Go"/>!" />
-			</td>
-			<td align="left">
-				<a href="<inp2:m_Link template="platform/search/advanced_search" />" class="more-link"><inp2:m_Phrase label="lu_btn_AdvancedSearch"/></a>  <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" /><br />
-			</td>
-		</tr>
-	</table>
-	##-->
-</form>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/side_boxes/related_searches.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/side_boxes/related_searches.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/side_boxes/related_searches.elm.tpl	(revision 0)
@@ -1,15 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_RelatedSearches"/>
-</inp2:m_Capture>
-
-<inp2:m_DefineElement name="related_search_element">
-	<tr>
-		<td>
-			<a href="<inp2:RelatedSearchUrl search_template="platform/search/search_results"/>"><inp2:Field name="Keyword"/></a>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<table>
-	<inp2:c-search_PrintList render_as="related_search_element"/>
-</table>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/content_boxes/nothing_found.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/content_boxes/nothing_found.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/content_boxes/nothing_found.elm.tpl	(revision 0)
@@ -1,25 +0,0 @@
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase name="lu_title_SearchResults"/>
-	</inp2:m_Capture>
-
-	<table class="warning-message fullwidth">
-		<tr>
-			<td width="30">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
-			</td>
-			<td>
-				<inp2:m_phrase name="lu_Warning"/><br />
-			</td>
-		</tr>
-	</table>
-	<br />
-
-	<inp2:m_if check="m_Get" var="keywords_too_short">
-		<inp2:m_Phrase label="lu_text_KeywordsTooShort"/>!
-	<inp2:m_else/>
-		<inp2:m_Phrase label="lu_text_NothingFound"/>!
-	</inp2:m_if>
-</inp2:m_RenderElement>
-
-<inp2:m_ModuleInclude template="elements/content_boxes/pick_items.elm"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/content_boxes/sub_categories.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/content_boxes/sub_categories.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/content_boxes/sub_categories.elm.tpl	(revision 0)
@@ -1,50 +0,0 @@
-<!-- categories -->
-<inp2:m_RenderElement design="content_box" data_exists="0">
-	<inp2:m_Capture to_var="header">
-		<strong><inp2:c_Field name="Name"/></strong>
-	</inp2:m_Capture>
-
-	<!--## CATEGORY IMAGE & DESCRIPTION ##-->
-	<table class="fullwidth category-header">
-		<tr>
-			<td valign="top">
-				<inp2:m_if check="c_ImageSrc" MaxWidth="thumbnail">
-					<img src="<inp2:c_ImageSrc Primary="1" MaxWidth="thumbnail" />" class="image_border" align="right" hspace="5" vspace="0" alt="<inp2:c_Field name="Name"/>"/>
-				</inp2:m_if>
-				<inp2:c_Field name="Description"/>
-			</td>
-		</tr>
-	</table>
-	<!--## /CATEGORY IMAGE & DESCRIPTION ##-->
-</inp2:m_RenderElement>
-
-<inp2:m_RenderElement design="content_box_noheader" data_exists="1">
-	<inp2:c_InitList list_name="sub_categories" page_var="m_cat_page"/>
-
-	<inp2:m_Capture to_var="header">
-		<inp2:m_phrase name="lu_title_Categories"/> (<inp2:c_TotalRecords list_name="sub_categories"/>)
-	</inp2:m_Capture>
-
-	<table class="fullwidth">
-		<tr>
-			<td class="category-statistics">
-				<inp2:m_phrase name="lu_TotalCategories"/>: <inp2:c_CategoryCount/>  &nbsp;|&nbsp;  <inp2:m_phrase name="lu_AddedToday"/>: <inp2:c_CategoryCount today="1"/>
-			</td>
-			<td class="category-statistics" align="right">
-				<inp2:m_phrase name="lu_CategoriesUpdated"/>: <inp2:c_LastUpdated format="_regional_DateFormat"/>
-			</td>
-		</tr>
-	</table>
-
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt="" /><br />
-	<br />
-
-	<inp2:m_include template="platform/elements/categories.elm"/>
-
-	<table class="fullwidth">
-		<inp2:c_ListCategories list_name="sub_categories" render_as="category_element" columns="2" direction="H"/>
-	</table>
-	<br /><inp2:m_include template="platform/elements/pagination.elm" prefix="c" list_name="sub_categories"/>
-</inp2:m_RenderElement>
-<!-- // categories -->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/side_boxes/login.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/side_boxes/login.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/side_boxes/login.elm.tpl	(revision 0)
@@ -1,125 +0,0 @@
-<!-- LOGIN BOX TITLE -->
-<inp2:m_Capture to_var="header">
-	<table class="fullwidth">
-		<tr>
-			<td class="side-box-title" align="left">
-				<inp2:m_phrase name="lu_title_LoginBox"/>
-			</td>
-			<td align="right" class="login-status">
-
-				<!-- IF LOGGED IN SHOW NAME -->
-				<inp2:m_if check="m_LoggedIn">
-					<a href="<inp2:m_Link template="platform/my_account/my_profile" m_cat_id="0" m_cat_page="1"/>"><inp2:u_Field name="FirstName"/> <inp2:u_Field name="LastName"/></a><br />
-				<!-- /IF LOGGED IN SHOW NAME -->
-				<inp2:m_else/>
-
-					<table>
-						<tr>
-							<td width="11">
-								<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/not_logged.gif" alt="" width="11" height="11" border="0" /><br />
-							</td>
-							<td class="login-status">
-								&nbsp;<inp2:m_Phrase label="lu_NotLoggedIn"/>
-							</td>
-						</tr>
-					</table>
-				</inp2:m_if>
-			</td>
-		</tr>
-	</table>
-</inp2:m_Capture>
-<!-- /LOGIN BOX TITLE -->
-
-<!-- IF LOGGED! -->
-<inp2:m_if check="m_LoggedIn">
-	<table width="100%" style="border-width: 0px;">
-		<tr>
-			<td colspan="2"><strong><inp2:m_phrase name="lu_section_MyAccount"/></strong></td>
-		</tr>
-
-		<!-- SHOW MY PROFILE -->
-		<inp2:m_RenderElement name="box_element" template="platform/my_account/my_profile" title="lu_MyProfile"/>
-		<!-- /SHOW MY PROFILE -->
-
-		<!-- SHOW MY FAVORITES -->
-		<inp2:m_RenderElement name="box_element" template="platform/my_account/my_favorites" title="lu_MyFavorites"/>
-		<!-- /SHOW MY FAVORITES -->
-
-		<!-- SHOW MY PREFERENCES -->
-		<inp2:m_RenderElement name="box_element" template="platform/my_account/my_preferences" title="lu_MyPreferences"/>
-		<!-- /SHOW MY PREFERENCES -->
-
-		<!-- INCLUDE "themes/default2007/[MODULE_NAME]/my_account/my_items.elm.tpl" FOR EACH INSTALLED MODULE -->
-		<inp2:m_ModuleInclude template="my_account/my_items.elm" place="sidebox" section="1"/>
-		<!-- /INCLUDE "themes/[MODULE_NAME]/my_account/my_items.elm.tpl" FOR EACH INSTALLED MODULE -->
-
-		<tr>
-			<td>
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
-			</td>
-			<td>
-				<a href="<inp2:u_LogoutLink template="index" />"><inp2:m_Phrase label="lu_logout"/></a>
-			</td>
-		</tr>
-
-		<tr>
-			<td colspan="2">
-		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="7" border="0" /><br />
-			</td>
-		</tr>
-
-		<tr>
-			<td colspan="2">
-				<strong><inp2:m_phrase name="lu_section_MyItems"/></strong>
-			</td>
-		</tr>
-
-		<inp2:m_ModuleInclude template="my_account/my_items.elm" place="sidebox" section="2"/>
-	</table>
-
-<!-- /IF LOGGED -->
-<inp2:m_else/>
-<!-- IF NOT LOGGED IN! -->
-
-	<form method="post" action="<inp2:m_FormAction />">
-		<inp2:m_if check="u_UseUsernames">
-			<inp2:m_phrase label="lu_username"/><br />
-			<input class="input-text" type="text" name="login" style="width:155px" /><br />
-		<inp2:m_else/>
-			<inp2:m_phrase label="lu_email"/><br />
-			<input class="input-text" type="text" name="email" style="width:155px" /><br />
-		</inp2:m_if>
-
-		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
-
-		<inp2:m_Phrase label="lu_Password"/><br />
-		<input type="password" class="input-text" name="password" style="width:155px" /><br />
-
-		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
-
-		<table>
-			<tr>
-				<td width="10">
-					<input class="button" name="events[u][OnLogin]" type="submit" value="<inp2:m_Phrase label="lu_Login"/>" /><br />
-				</td>
-				<td align="left">
-					<input type="checkbox" name="cb_remember_login" value="1"/> <span class="remember-login"><inp2:m_Phrase label="lu_remember_login"/></span>
-				</td>
-			</tr>
-		</table>
-
-		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="5" height="5" border="0" /><br />
-		<inp2:m_if check="u_HasError" field="any">
-			<span class="field-error"><inp2:u_Error field="ValidateLogin"/></span><br />
-		</inp2:m_if>
-
-		<inp2:m_if check="u_RegistrationEnabled">
-			<a href="<inp2:m_Link template="platform/login/register" m_cat_id="0" m_cat_page="1"/>" class="more-link" ><inp2:m_Phrase label="lu_Register"/></a> <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" /><br />
-		</inp2:m_if>
-
-		<a href="<inp2:m_Link template="platform/login/forgot_password" m_cat_id="0" m_cat_page="1"/>" class="more-link" ><inp2:m_Phrase label="lu_ForgotPassword"/>?</a>  <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" />
-		<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
-		<input type="hidden" name="pending_disabled_template" value="platform/login/login_pending_disabled" />
-	</form>
-</inp2:m_if>
-<!-- /IF NOT LOGGED IN -->
Index: branches/5.1.x/themes/default2009/platform/elements/content_boxes/related_items.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/content_boxes/related_items.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/content_boxes/related_items.elm.tpl	(revision 0)
@@ -1,7 +0,0 @@
-<!--## related category items ##-->
-	<inp2:m_include template="platform/elements/categories.elm"/>
-
-	<ul>
-		<inp2:c_ListCategories render_as="related_category_element" types="related" related_to="$related_to" parent_cat_id="any" no_table="1"/>
-	</ul>
-<!--## // related category items ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/side_boxes/mailing_list.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/side_boxes/mailing_list.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/side_boxes/mailing_list.elm.tpl	(revision 0)
@@ -1,21 +0,0 @@
-<inp2:m_Capture to_var="header">
-	<inp2:m_phrase name="lu_title_MailingList"/>
-</inp2:m_Capture>
-
-<inp2:m_Phrase label="lu_EnterEmailToSubscribe"/><br />
-<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
-
-<form method="POST" action="<inp2:m_FormAction />" name="mailing_list_form">	
-	<input type="text" name="subscriber_email" class="input-text" style="width: 155px;"/><br />
-	<inp2:m_if check="u_HasError" field="any">
-		<span class="field-error"><inp2:u_Error field="SubscribeEmail"/></span><br />
-	</inp2:m_if>
-
-	<br />
-	<input class="button" name="events[u][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label="lu_btn_Subscribe"/>" />
-	<input class="button" name="events[u][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label="lu_btn_Unsubscribe" />" />
-	&nbsp;
-	<input type="text" style="display: none" />
-	<input type="hidden" name="subscribe_template" value="platform/mailing_list/subscribe"/>
-	<input type="hidden" name="unsubscribe_template" value="platform/mailing_list/unsubscribe"/>
-</form>
Index: branches/5.1.x/themes/default2009/platform/elements/content_boxes/no_favorites.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/content_boxes/no_favorites.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/content_boxes/no_favorites.elm.tpl	(revision 0)
@@ -1,9 +0,0 @@
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase name="lu_title_Favorites"/>
-	</inp2:m_Capture>
-
-	<inp2:m_Phrase label="lu_NoFavorites"/>
-</inp2:m_RenderElement>
-
-<inp2:m_ModuleInclude template="elements/content_boxes/pick_items.elm"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/inc/captcha_image.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/inc/captcha_image.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/inc/captcha_image.elm.tpl	(revision 0)
@@ -1 +0,0 @@
-<inp2:m_NoDebug/><inp2:m_CaptchaImage />
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/my_account/preferences_tab.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/my_account/preferences_tab.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/my_account/preferences_tab.elm.tpl	(revision 0)
@@ -1 +0,0 @@
-<inp2:m_RenderElement name="tab" title="lu_tab_Privacy" template="platform/my_account/my_preferences"/>
Index: branches/5.1.x/themes/default2009/platform/designs/popup_design.des.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/designs/popup_design.des.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/designs/popup_design.des.tpl	(revision 0)
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<inp2:m_include template="platform/elements/side_boxes.elm"/>
-<inp2:m_include template="platform/elements/content_boxes.elm"/>
-<inp2:m_include template="platform/elements/forms.elm"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>
-			<inp2:m_GetConfig name="Site_Name"/>
-		</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
-		<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
-	</head>
-	<body>
-		<inp2:m_RenderElement name="content"/>
-		<br />
-		<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /><br /></div>
-		<br />
-
-		<div style="text-align: center;">
-			<a href="<inp2:m_Link/>" onclick="window.close(); return false;"><inp2:m_Phrase name="lu_btn_CloseWindow"/></a>
-		</div>
-	</body>
-</html>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/designs/default_design.des.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/designs/default_design.des.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/designs/default_design.des.tpl	(revision 0)
@@ -1,123 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<inp2:m_CheckSSL/>
-<inp2:m_include template="platform/elements/side_boxes.elm" strip_nl="1"/>
-<inp2:m_include template="platform/elements/content_boxes.elm" strip_nl="1"/>
-<inp2:m_include template="platform/elements/forms.elm" strip_nl="1"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<inp2:m_DefineElement name="cms_page_title">
-			<inp2:st_PageInfo type="htmlhead_title"/>
-		</inp2:m_DefineElement>
-
-		<title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/></title>
-
-		<!--## Include module specific HEADER (META INFORMATION inside) template ##-->
-		<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
-
-		<inp2:st_EditingScripts/>
-		<!--## /Include module specific HEADER template ##-->
-	</head>
-	<body>
-		<inp2:st_EditPage mode="start"/>
-		<div align="left">
-			<div align="left" style="width:100%">
-				<table class="fullwidth">
-					<tr>
-						<td>
-							<inp2:m_include template="platform/elements/header.elm"/>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<inp2:m_include template="platform/elements/menu.elm"/>
-						</td>
-					</tr>
-				</table>
-
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" alt=""/><br />
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt=""/><br />
-
-				<table class="fullwidth">
-					<tr>
-						<!-- SIDEBAR -->
-						<td style="width: 200px;" valign="top">
-							<inp2:m_DefineElement name="cms_sidebar">
-								<div class="movable-area">
-									<div class="movable-element">
-										<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-									</div>
-									<div class="movable-element">
-										<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-									</div>
-								</div>
-							</inp2:m_DefineElement>
-
-							<inp2:m_RenderElement name="sidebar" default_element="cms_sidebar" layout_view="1"/>
-						</td>
-						<!-- /SIDEBAR -->
-
-						<!-- SEPARATOR -->
-						<td width="3" class="vertical-separator" style="width: 3px;">
-							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
-						</td>
-						<!-- /SEPARATOR -->
-
-						<!-- CONTENT -->
-						<td style="width: auto;" valign="top">
-							<inp2:m_DefineElement name="cms_content">
-								<div class="movable-area">
-									<div class="movable-element">
-										<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-									</div>
-
-									<div class="movable-element">
-										<inp2:m_RenderElement design="content_box">
-											<inp2:m_Capture to_var="header">
-												<inp2:st_PageInfo type="title"/>
-											</inp2:m_Capture>
-
-											<inp2:st_ContentBlock num="1"/>
-										</inp2:m_RenderElement>
-									</div>
-								</div>
-							</inp2:m_DefineElement>
-
-							<inp2:m_RenderElement name="content" default_element="cms_content" layout_view="1"/>
-							<br />
-						</td>
-						<!-- /CONTENT -->
-
-						<!--## REMOVE THIS LINE TO UNCOMMENT
-						<!-- SEPARATOR -->
-						<td width="3" class="vertical-separator">
-							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br />
-						</td>
-						<!-- /SEPARATOR -->
-
-						<!-- RIGHT-SIDEBAR WITH BANNER -->
-						<td style="width: 200px;" valign="top">
-							<div class="movable-area">
-								<div class="movable-element">
-									<inp2:m_include template="platform/elements/banners/banner_right.elm"/>
-								</div>
-							</div>
-						</td>
-						<!-- /RIGHT-SIDEBAR WITH BANNER -->
-						REMOVE THIS LINE TO UNCOMMENT ##-->
-					</tr>
-				</table>
-
-				<table class="fullwidth">
-					<tr>
-						<td >
-							<inp2:m_include template="platform/elements/footer.elm"/>
-						</td>
-					</tr>
-				</table>
-			</div>
-		</div>
-		<inp2:st_EditPage mode="end"/>
-	</body>
-</html>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/designs/default_design_ajax.des.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/designs/default_design_ajax.des.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/designs/default_design_ajax.des.tpl	(revision 0)
@@ -1,4 +0,0 @@
-<inp2:m_include template="platform/elements/content_boxes.elm" strip_nl="1"/>
-<inp2:m_include template="platform/elements/forms.elm" strip_nl="1"/>
-
-<inp2:m_RenderElement name="content"/>
Index: branches/5.1.x/themes/default2009/platform/elements/users.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/users.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/users.elm.tpl	(revision 0)
@@ -1,35 +0,0 @@
-<!--## DESIGNS OF LINK ELEMENTS DESCRIBED IN THIS TEMPLATE ##-->
-
-<!--## USER ELEMENT ##-->
-<inp2:m_DefineElement name="user_element">
-	<tr>
-		<td colspan="4">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-		</td>
-	</tr>
-	<tr class="listing-row">
-		<td valign="top">
-			<a href="<inp2:ProfileLink template="platform/my_account/public_profile"/>"><inp2:Field name="Login"/></a>
-		</td>
-		<td valign="top">
-			<inp2:m_if check="LoggedIn">
-				<inp2:m_Phrase name="lu_Yes"/>
-			<inp2:m_else/>
-				<inp2:m_Phrase name="lu_No"/>
-			</inp2:m_if>
-		</td>
-		<td valign="top">
-			<inp2:Field name="Email"/>
-		</td>
-		<td valign="top">
-			<inp2:Field name="CreatedOn"/>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /USER ELEMENT ##-->
-
-<!--## NO USERS ELEMENT ##-->
-<inp2:m_DefineElement name="no_users">
-	<inp2:m_phrase name="lu_NoMembers"/>
-</inp2:m_DefineElement>
-<!--## /NO USERS ELEMENT ##-->
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/side_boxes.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/side_boxes.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/side_boxes.elm.tpl	(revision 0)
@@ -1,14 +0,0 @@
-<inp2:m_DefineElement name="blue_box">
-	<table style="width: 100%;">
-		<tr class="movable-header">
-			<td class="side-box-header">
-				<div class="side-box-title"><inp2:m_param name="header"/></div>
-			</td>
-		</tr>
-		<tr>
-			<td class="side-box-content">
-				<inp2:m_param name="content"/>
-			</td>
-		</tr>
-	</table>
-</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/content_boxes.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/content_boxes.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/content_boxes.elm.tpl	(revision 0)
@@ -1,175 +0,0 @@
-<!--## MAIN CONTENT BOX ELEMENT DESIGN ##-->
-<inp2:m_DefineElement name="content_box">
-	<table class="fullwidth">
-		<tr>
-			<td colspan="3">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="20" alt=""/><br />
-			</td>
-		</tr>
-		<tr class="movable-header">
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-			<td class="content-box-header table-border">
-				<div class="content-box-title"><inp2:m_param name="header"/></div>
-			</td>
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-		</tr>
-		<tr>
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-			<td class="content-box-content">
-				<inp2:m_param name="content"/>
-			</td>
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-		</tr>
-	</table>
-</inp2:m_DefineElement>
-<!--## /MAIN CONTENT BOX ELEMENT DESIGN ##-->
-
-<!--## DESIGN OF CONTENT BOX SUB-SECTION ELEMENT##-->
-<inp2:m_DefineElement name="content_box_subsection">
-	<table class="fullwidth">
-		<tr>
-			<td colspan="3">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="20" alt=""/><br />
-			</td>
-		</tr>
-		<tr class="movable-header">
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-			<td class="content-box-header table-border">
-				<div class="content-box-title"><inp2:m_param name="subsection_header"/></div>
-			</td>
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-		</tr>
-		<tr>
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-			<td class="content-box-content">
-				<inp2:m_param name="content"/>
-			</td>
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-		</tr>
-	</table>
-</inp2:m_DefineElement>
-<!--## //DESIGN OF CONTENT BOX SUB-SECTION ELEMENT##-->
-
-<!--## CONTENT BOX NO-HEADER ELEMENT DESIGN ##-->
-<inp2:m_DefineElement name="content_box_noheader">
-	<table class="fullwidth">
-		<tr class="movable-header">
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-			<td class="content-box-content">
-				<inp2:m_param name="content"/>
-			</td>
-			<td width="13">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="13" height="1" alt=""/><br />
-			</td>
-		</tr>
-	</table>
-</inp2:m_DefineElement>
-<!--## /CONTENT BOX NO-HEADER ELEMENT DESIGN ##-->
-
-<inp2:m_DefineElement name="menu_element" current="" no_editing="1">
-	<inp2:m_if check="m_Param" name="current">
-		<td>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_active_border.gif" width="1" height="37" alt=""/><br />
-		</td>
-		<td class="menu-top-active-icon top-menu-padding">
-			<a href="<inp2:m_param name="menu_href" no_editing="1"/>"><inp2:m_if check="m_Param" name="menu_icon_src"><img src="<inp2:m_Param name="menu_icon_src"/>"/><inp2:m_else/><inp2:m_param name="menu_icon" no_editing="1"/></inp2:m_if></a>
-		</td>
-		<td class="menu-top-active-text top-menu-padding">
-			<a href="<inp2:m_param name="menu_href" no_editing="1"/>" class="top-menu-link"><inp2:m_param name="menu_title" no_editing="1"/></a>
-		</td>
-		<td>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_active_border.gif" width="1" height="37" alt=""/><br />
-		</td>
-	<inp2:m_else/>
-		<td>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="37" alt=""/><br />
-		</td>
-		<td class="menu-top-noactive-icon top-menu-padding">
-			<a href="<inp2:m_param name="menu_href" no_editing="1"/>"><inp2:m_if check="m_Param" name="menu_icon_src"><img src="<inp2:m_Param name="menu_icon_src"/>"/><inp2:m_else/><inp2:m_param name="menu_icon" no_editing="1"/></inp2:m_if></a>
-		</td>
-		<td class="menu-top-noactive-text top-menu-padding">
-			<a href="<inp2:m_param name="menu_href" no_editing="1"/>" class="top-menu-link"><inp2:m_param name="menu_title" no_editing="1"/></a>
-		</td>
-		<td>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="37" alt=""/><br />
-		</td>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="box_element" no_editing="1" prefix="">
-	<tr>
-		<td>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
-		</td>
-		<td>
-			<inp2:m_if check="m_Param" name="prefix">
-				<a href="<inp2:{$prefix}_SuggestItemLink template="$template"/>"><inp2:m_Phrase label="$title"/></a>
-			<inp2:m_else/>
-				<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="$title"/></a>
-			</inp2:m_if>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="review_element">
-	<tr>
-		<td>
-			<strong><inp2:m_Phrase name="lu_fld_ReviewBy"/>:</strong> <inp2:Field name="ReviewedBy"/> [<inp2:Field name="CreatedOn" format="_regional_DateFormat"/>]<br />
-			<strong><inp2:m_Phrase name="lu_fld_ReviewText"/>:</strong> <inp2:Field name="ReviewText"/>
-			<br /><br />
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="rating_element">
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/star<inp2:m_if check="m_Param" name="active">_rate</inp2:m_if>.gif" width="10" height="11" alt=""/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="category_path_element">
-	<inp2:m_ifnot check="c_HomeCategory" equals_to="$cat_id">
-		<inp2:m_param name="separator"/>
-	</inp2:m_ifnot>
-	<inp2:m_param name="cat_name"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="image_element">
-	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" align="<inp2:m_param name="align"/>" />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="tab">
-	<td class="<inp2:m_if check="m_IsActive" template="$template">active-tab<inp2:m_else/>inactive-tab</inp2:m_if>">
-		<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_phrase name="$title"/></a>
-	</td>
-	<td width="8">&nbsp;
-
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="file_element">
-	<tr>
-		<td class="file-list-icon">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/file_icons/<inp2:FileIcon default="icon_file.gif"/>" alt="<inp2:Field name="FileName"/>" border="0" /><br />
-		</td>
-		<td class="file-list-label">
-			<a href="<inp2:DownloadFileLink />"><inp2:Field name="FileName"/></a>
-		</td>
-	<tr>
-</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/preferences.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/preferences.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/preferences.elm.tpl	(revision 0)
@@ -1,35 +0,0 @@
-<inp2:m_DefineElement name="privacy_element">
-	<tr>
-		<td class="field-name"><inp2:m_phrase name="$title"/></td>
-		<td><inp2:user-profile_Field field="$field" profile_field="1"/></td>
-		<td class="field-value">
-			<input type="hidden" id="<inp2:user-profile_InputName field="$field"/>" name="<inp2:user-profile_InputName field="$field"/>" value="<inp2:user-profile_Field field="$field"/>"/>
-			<input type="checkbox" id="_cb_<inp2:user-profile_InputName field="$field"/>" <inp2:user-profile_Field field="$field" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:user-profile_InputName field="$field"/>'));"/>
-		</td>
-	</tr>
-	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">
-	<tr>
-		<td colspan="3">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="profile_element">
-	<inp2:m_if check="user-profile_Field" name="$field">
-		<inp2:m_inc param="fields_shown" by="1"/>
-		<tr>
-			<td class="field-name"><inp2:m_phrase name="$title"/></td>
-			<td class="field-value"><inp2:user-profile_Field field="$field" profile_field="1"/></td>
-		</tr>
-
-		<inp2:m_if check="user-profile_NotLastField" counter="fields_shown">
-		<tr>
-			<td colspan="3">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-			</td>
-		</tr>
-		</inp2:m_if>
-	</inp2:m_if>
-</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/categories.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/categories.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/categories.elm.tpl	(revision 0)
@@ -1,126 +0,0 @@
-<!--## CATEGORY ELEMENT ##-->
-<inp2:m_DefineElement name="category_element">
-	<td style="width: <inp2:ColumnWidth/>">
-
-		<table>
-			<tr>
-				<td class="directory-icon">
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/directory_icon.gif" width="22" height="17" alt="" /><br />
-				</td>
-				<td class="directory-text">
-					<inp2:m_if check="IsCurrent">
-						<strong><inp2:Field name="Name"/></strong> (<inp2:m_phrase name="lu_SubCats"/>: <inp2:SubCatCount/>)
-					<inp2:m_else/>
-						<!--## CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
-						<inp2:m_if check="IsCategorySymLink">
-							<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><i><inp2:Field name="Name"/> @</i></a> <span class="item-statistics">(<!--## <inp2:m_phrase name="lu_SubCats"/>: ##--><inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
-						<inp2:m_else/>
-							<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><inp2:Field name="Name"/></a> <span class="item-statistics">(<!--## <inp2:m_phrase name="lu_SubCats"/>: ##--><inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
-						</inp2:m_if>
-						<!--## /CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
-					</inp2:m_if>
-
-					<inp2:m_if check="Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
-					<inp2:m_if check="IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
-
-					<br />
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="4" alt="" /><br />
-
-					<inp2:Field name="Description" first_chars="200"/>
-				</td>
-			</tr>
-		</table>
-
-	</td>
-</inp2:m_DefineElement>
-<!--## /CATEGORY ELEMENT ##-->
-
-<!--## NO CATEGORIES ELEMENT ##-->
-<inp2:m_DefineElement name="no_categories">
-	<inp2:m_phrase name="lu_NoCategories"/>
-</inp2:m_DefineElement>
-<!--## /NO CATEGORIES ELEMENT ##-->
-
-<!--## NO CATEGORIES ELEMENT ##-->
-<inp2:m_DefineElement name="related_category_element">
-	<!--## CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
-	<li>
-	<inp2:m_if check="IsCategorySymLink">
-		<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><i><inp2:Field name="Name"/> @</i></a>
-	<inp2:m_else/>
-		<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><inp2:Field name="Name"/></a>
-	</inp2:m_if>
-	</li>
-	<!--## /CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
-</inp2:m_DefineElement>
-<!--## /NO CATEGORIES ELEMENT ##-->
-
-<inp2:m_DefineElement name="selector_category_element">
-	<option value="<inp2:m_Param name="category_id"/>">
-		<inp2:m_Param name="separator"/><inp2:m_Param name="category_name"/>
-	</option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="more_category_element">
-	<tr id="category_<inp2:m_Param name="category_id"/>">
-		<td>
-			<inp2:m_Param name="category_name"/>
-		</td>
-		<td>
-			<input type="button" class="delete-button" value="<inp2:m_Phrase name="lu_btn_Delete"/>" onclick="$ItemCategories.DeleteCategory(<inp2:m_Param name="category_id"/>);"/>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-
-<!--## SITEMAP ELEMENTS ##-->
-<inp2:m_DefineElement name="more_link_elem">
-<li>
-	<a href="<inp2:c_CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:m_Phrase label="lu_more"/>...</a>
-</li>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sitemap_category_element3">
-<li>
-	<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>1
-</li>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sitemap_category_element2">
-<li>
-	<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>
-	<inp2:InitList requery="1"/>
-	<inp2:m_if check="TotalRecords">
-	<ul>
-		<inp2:ListCategories render_as="sitemap_category_element2" more_link_render_as="more_link_elem" max_items="50" no_table="1"/>
-	</ul>
-	</inp2:m_if>
-</li>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sitemap_category_element1">
-<li>
-	<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/></a>
-	<inp2:InitList requery="1"/>
-	<inp2:m_if check="TotalRecords">
-	<ul>
-		<inp2:ListCategories render_as="sitemap_category_element2" max_items="50" more_link_render_as="more_link_elem" no_table="1"/>
-	</ul>
-	</inp2:m_if>
-</li>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sitemap_category_element">
-	<li>
-		<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name" html_escape="1"/> (level 2)</a>
-		<inp2:InitList requery="1" max_items="50" />
-		<inp2:m_if check="TotalRecords">
-		<ul>
-			<inp2:ListCategories render_as="sitemap_category_element1" max_items="100" more_link_render_as="more_link_elem" no_table="1"/>
-		</ul>
-		</inp2:m_if>
-	</li>
-</inp2:m_DefineElement>
-
-
-<!--## //SITEMAP ELEMENTS ##-->
Index: branches/5.1.x/themes/default2009/platform/elements/search_results.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/search_results.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/search_results.elm.tpl	(revision 0)
@@ -1,20 +0,0 @@
-<inp2:m_DefineElement name="search_relevance_normal">
-	<inp2:m_Phrase label="lu_Relevance"/>:<br />
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""><br />
-	<table width="70" style="border: 1px solid <inp2:m_param name="on_color"/>">
-		<tr>
-			<td width="<inp2:m_param name="percent_on" />%" bgcolor="<inp2:m_param name="on_color"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""></td>
-			<td width="<inp2:m_param name="percent_off" />%" bgcolor="<inp2:m_param name="off_color"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""></td>
-		</tr>
-	</table>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="search_relevance_full">
-	<inp2:m_Phrase label="lu_Relevance"/>:<br />
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""><br />
-	<table width="70">
-		<tr>
-			<td width="100%" bgcolor="<inp2:m_param name="on_color" />"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""></td>
-		</tr>
-	</table>
-</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/designs/general.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/designs/general.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/designs/general.tpl	(revision 0)
@@ -1,56 +0,0 @@
-<!--##
-<NAME>General - Design</NAME>
-<DESC>General - Design</DESC>
-<SECTION>Platform</SECTION>
-##-->
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:st_PageInfo type="title"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:st_PageInfo type="title"/>
-				</inp2:m_Capture>
-
-				<inp2:st_ContentBlock num="1"/>
-			</inp2:m_RenderElement>
-		</div>
-	<div class="movable-area">
-	<!--## RELATED TO PAGE ITEMS ##-->
-	<!--##
-	<div class="movable-element">
-		<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
-			<inp2:m_Capture to_var="header">
-				<inp2:m_Phrase label="lu_title_RelatedItems"/>
-			</inp2:m_Capture>
-
-			<inp2:m_ModuleInclude template="elements/content_boxes/related_items" related_to="$related_to" />
-		</inp2:m_RenderElement>
-	</div>
-	##-->
-	<!--## // RELATED TO PAGE ITEMS ##-->
-
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/designs/form.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/designs/form.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/designs/form.tpl	(revision 0)
@@ -1,70 +0,0 @@
-<!--##
-<NAME>CMS Form - Design</NAME>
-<DESC>CMS Form - Design</DESC>
-<SECTION>Platform</SECTION>
-##-->
-<inp2:m_include template="platform/elements/dynamic_forms.elm"/>
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:st_PageInfo type="title"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:st_PageInfo type="title"/>
-				</inp2:m_Capture>
-
-				<inp2:st_ContentBlock num="1"/>
-				<p>
-					<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-					<inp2:formsubs_PresetFormFields/>
-
-					<inp2:m_if check="formsubs_HasError" field="any">
-						<inp2:m_RenderElement name="error_message" />
-					</inp2:m_if>
-
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
-
-					<form method="post" action="<inp2:m_FormAction m_cat_id="0" m_cat_page="1"/>">
-
-						<table class="form-data fullwidth">
-							<inp2:formflds_PrintList render_as="form_field" SourcePrefix="formsubs" per_page="-1"/>
-
-							<inp2:m_RenderElement design="inp_edit_buttons">
-								<input type="submit" class="button" name="events[formsubs][OnCreate]" value="<inp2:m_Phrase label="lu_send"/>"/>
-
-								<input type="hidden" name="<inp2:formsubs_InputName field="FormId"/>" value="<inp2:m_Get var="form_id"/>"/>
-								<input type="hidden" name="form_id" value="<inp2:m_Get var="form_id"/>"/>
-								<input type="hidden" name="success_template" value="<inp2:st_Field name="FormSubmittedTemplate"/>"/>
-							</inp2:m_RenderElement>
-						</table>
-					</form>
-				</p>
-				<inp2:st_ContentBlock num="2"/>
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/menu_inedit.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/elements/dynamic_forms.elm.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/dynamic_forms.elm.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/dynamic_forms.elm.tpl	(revision 0)
@@ -1,58 +0,0 @@
-<inp2:m_DefineElement name="form_field_text">
-	<input type="text" class="input-text" name="<inp2:CustomInputName/>" value="<inp2:SubmissionTag tag="Field"/>" <inp2:m_param name="field_params" />/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="form_field_password">
-	<input type="password" class="input-text" primarytype="password" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="" />
-	<input type="password" class="input-text" name="<inp2:CustomInputName verify="1"/>" id="verify_<inp2:CustomInputName verify="1"/>" value="" />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="form_field_option">
-		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="form_field_select">
-	<select name="<inp2:CustomInputName/>" class="input-select">
-		<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_field_option" selected="selected"/>
-	</select>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="form_field_checkbox">
-	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:SubmissionTag tag="Field" field="$field" db="db"/>">
-	<input type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:SubmissionTag tag="Field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="document.getElementById('<inp2:CustomInputName/>').value = this.checked ? 1:0">
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="form_field_textarea">
-	<textarea name="<inp2:CustomInputName/>" class="input-textarea" <inp2:m_param name="field_params" />><inp2:SubmissionTag tag="Field" field="$field" /></textarea>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="form_radio_item">
-	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:m_param name="field_name"/>" id="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="form_field_radio">
-	<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_radio_item" selected="checked"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="form_field">
-	<tr>
-		<td class="field-name">
-			<strong><inp2:Field name="FieldLabel" plus_or_as_label="1"/><inp2:m_if check="FieldEquals" field="Required" value="1"><span class="field-required">*</span></inp2:m_if>:</strong>&nbsp;&nbsp;
-		</td>
-		<td class="field-value">
-			<inp2:m_if check="SubmissionTag" tag="HasError">
-				<span class="field-error"><inp2:SubmissionTag tag="Error"/></span><br />
-			</inp2:m_if>
-
-			<inp2:ConfigFormElement field="Value" blocks_prefix="form_field_" element_type_field="ElementType" value_list_field="ValueList" /><br/>
-		</td>
-	</tr>
-
-	<inp2:m_if check="m_Param" name="not_last">
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-			</td>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/page_icon.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/elements/menu_subsections.xml.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/menu_subsections.xml.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/menu_subsections.xml.tpl	(revision 0)
@@ -1,32 +0,0 @@
-<inp2:m_XMLTemplate cache="600"/>
-<inp2:m_Get var="page_id" result_to_var="page_id"/>
-<inp2:m_Inc param="level" by="1"/>
-<inp2:m_Get var="level" result_to_var="level"/>
-<inp2:m_Get var="max_level" result_to_var="max_level"/>
-<inp2:m_Random result_to_var="rand"/>
-<inp2:conf_ConfigValue name="CategoriesRebuildSerial" result_to_var="serial"/>
-<menus>
-  <menu id="subpages<inp2:m_Param name="page_id"/>"
-  		orient="V" showicon="true" showsubicon="true" stlprf=""
-  		submenuic="['<inp2:m_TemplatesBase module="In-portal"/>img/arrow_white.gif']">
-    <items>
-    	<inp2:m_DefineElement name="top_sub_menu_elem" no_editing="1">
-				<item id="menu<inp2:m_Param name="page_id"/>" url="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/></inp2:m_if>" enb="true"
-					<inp2:m_if inverse="1" check="m_ParamEquals" name="level" value="$max_level">
-						<inp2:m_if check="m_Param" name="has_sub_menu">
-							subid="subpages<inp2:m_Param name="page_id"/>"
-							suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/menu_subsections.xml"
-								m_cat_id="$cat_id"
-								m_cat_page="1"
-								page_id="$page_id"
-								level="$level" max_level="4"
-								rand="$rand" serial="$serial"/>"
-						</inp2:m_if>
-					</inp2:m_if>
-				><![CDATA[<inp2:m_Param name="title"/>]]></item>
-			</inp2:m_DefineElement>
-
-			<inp2:st_CachedMenu except="index" menu_id="$page_id" category_id="$cat_id" render_as="top_sub_menu_elem"/>
-    </items>
-  </menu>
-</menus>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/menu_sections.xml.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/menu_sections.xml.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/menu_sections.xml.tpl	(revision 0)
@@ -1,19 +0,0 @@
-<inp2:m_Random result_to_var="rand"/>
-<inp2:m_DefineElement name="top_menu_item" no_editing="1">
-	<item id="menu<inp2:m_Param name="page_id"/>"
-		url="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="$cat_id" m_cat_page="1"/></inp2:m_if>"
-		<inp2:m_if check="m_Param" name="menu_icon">
-			ico="['<inp2:m_TemplatesBase/><inp2:m_Param name="menu_icon"/>']"
-		<inp2:m_else/>
-			ico="['<inp2:m_TemplatesBase module="In-Portal"/>img/menu_inedit.gif']"
-		</inp2:m_if>
-		enb="true" title=""
-		subid="subpages<inp2:m_Param name="page_id"/>"
-		suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/menu_subsections.xml"
-		 m_cat_id="$cat_id"
-		 m_cat_page="1"
-		 page_id="$page_id"
-		 level="0" max_level="4"
-		/>" ><![CDATA[<inp2:m_Param name="title"/>]]></item>
-</inp2:m_DefineElement>
-<inp2:st_CachedMenu level="0" category_id="0" render_as="top_menu_item"/>
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/.smsignore
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/.smsignore	(revision 12127)
+++ branches/5.1.x/themes/default2009/.smsignore	(revision 0)
@@ -1 +0,0 @@
-phrases_edit\.tpl
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/designs/.smsignore
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/designs/.smsignore	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/designs/.smsignore	(revision 0)
@@ -1 +0,0 @@
-.*\.tpl
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/elements/.smsignore
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/elements/.smsignore	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/elements/.smsignore	(revision 0)
@@ -1 +0,0 @@
-.*\.xml\.tpl
\ No newline at end of file
Index: branches/5.1.x/themes/default2009/platform/img/language_icons/russian_off.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/language_icons/russian_on.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/language_icons/english_on.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/img/language_icons/english_off.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/themes/default2009/platform/sitemap.tpl
===================================================================
diff -u -N
--- branches/5.1.x/themes/default2009/platform/sitemap.tpl	(revision 12127)
+++ branches/5.1.x/themes/default2009/platform/sitemap.tpl	(revision 0)
@@ -1,57 +0,0 @@
-<!--##
-<NAME>Sitemap</NAME>
-<DESC>Sitemap of the website</DESC>
-<SECTION>Platform</SECTION>
-##-->
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_SiteMap"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
-
-<!--## SIDE-BAR ELEMENT ##-->
-<inp2:m_DefineElement name="sidebar">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-<!--## //SIDE-BAR ELEMENT ##-->
-
-<inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SiteMap" templates="platform/sitemap"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_SiteMap"/>
-				</inp2:m_Capture>
-
-				<inp2:m_include template="platform/elements/categories.elm"/>
-
-				<div id="sitemap">
-
-				<ul>
-					<inp2:c_ListCategories types="menu" render_as="sitemap_category_element" per_page="100" columns="1" direction="H" parent_cat_id="0" no_table="1"/>
-				</ul>
-
-				</div>
-			</inp2:m_RenderElement>
-		</div>
-	</div>
-</inp2:m_DefineElement>
-
-<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_infinity_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/tab_left.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/install/install_schema.sql
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 12127)
+++ branches/5.1.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 12657)
@@ -48,7 +48,7 @@
   heading varchar(255) default NULL,
   prompt varchar(255) default NULL,
   element_type varchar(20) NOT NULL default '',
-  validation varchar(255) default NULL,
+  Validation text,
   ValueList text,
   DisplayOrder double NOT NULL default '0',
   GroupDisplayOrder double NOT NULL default '0',
@@ -107,14 +107,16 @@
   Event varchar(40) NOT NULL default '',
   ReplacementTags text,
   Enabled int(11) NOT NULL default '1',
-  FromUserId int(11) NOT NULL default '-1',
+  FrontEndOnly tinyint(3) unsigned NOT NULL default '0',
+  FromUserId int(11) default NULL,
   Module varchar(40) NOT NULL default '',
   Description varchar(255) NOT NULL default '',
-  Type int(11) NOT NULL default '0',
+  `Type` int(11) NOT NULL default '0',
   PRIMARY KEY  (EventId),
-  KEY Type (Type),
+  KEY `Type` (`Type`),
   KEY Enabled (Enabled),
-  KEY Event (Event)
+  KEY Event (Event),
+  KEY FrontEndOnly (FrontEndOnly)
 );
 
 CREATE TABLE IdGenerator (
@@ -175,18 +177,20 @@
 );
 
 CREATE TABLE Phrase (
-  Phrase varchar(255) NOT NULL default '',
+  Phrase varchar(255) NOT NULL DEFAULT '',
+  PhraseKey varchar(255) NOT NULL,
   Translation text NOT NULL,
-  PhraseType int(11) NOT NULL default '0',
-  PhraseId int(11) NOT NULL auto_increment,
-  LanguageId int(11) NOT NULL default '0',
-  LastChanged int(10) unsigned NOT NULL default '0',
-  LastChangeIP varchar(15) NOT NULL default '',
-  Module varchar(30) NOT NULL default 'In-Portal',
-  PRIMARY KEY  (PhraseId),
+  PhraseType int(11) NOT NULL DEFAULT '0',
+  PhraseId int(11) NOT NULL AUTO_INCREMENT,
+  LanguageId int(11) NOT NULL DEFAULT '0',
+  LastChanged int(10) unsigned NOT NULL DEFAULT '0',
+  LastChangeIP varchar(15) NOT NULL DEFAULT '',
+  Module varchar(30) NOT NULL DEFAULT 'In-Portal',
+  PRIMARY KEY (PhraseId),
   UNIQUE KEY LanguageId_2 (LanguageId,Phrase),
   KEY LanguageId (LanguageId),
-  KEY Phrase_Index (Phrase)
+  KEY Phrase_Index (Phrase),
+  KEY PhraseKey (PhraseKey)
 );
 
 CREATE TABLE PhraseCache (
@@ -318,21 +322,21 @@
 );
 
 CREATE TABLE UserSession (
-  SessionKey int(10) unsigned NOT NULL default '0',
-  CurrentTempKey int(10) unsigned default NULL,
-  PrevTempKey int(10) unsigned default NULL,
-  LastAccessed int(10) unsigned NOT NULL default '0',
-  PortalUserId int(11) NOT NULL default '-2',
-  `Language` int(11) NOT NULL default '1',
-  Theme int(11) NOT NULL default '1',
-  GroupId int(11) NOT NULL default '0',
-  IpAddress varchar(20) NOT NULL default '0.0.0.0',
-  `Status` int(11) NOT NULL default '1',
-  GroupList varchar(255) default NULL,
-  tz int(11) default NULL,
-  PRIMARY KEY  (SessionKey),
+  SessionKey int(10) unsigned NOT NULL DEFAULT '0',
+  LastAccessed int(10) unsigned NOT NULL DEFAULT '0',
+  PortalUserId int(11) NOT NULL DEFAULT '-2',
+  `Language` int(11) NOT NULL DEFAULT '1',
+  Theme int(11) NOT NULL DEFAULT '1',
+  GroupId int(11) NOT NULL DEFAULT '0',
+  IpAddress varchar(20) NOT NULL DEFAULT '0.0.0.0',
+  `Status` int(11) NOT NULL DEFAULT '1',
+  GroupList varchar(255) DEFAULT NULL,
+  tz int(11) DEFAULT NULL,
+  BrowserSignature varchar(32) NOT NULL,
+  PRIMARY KEY (SessionKey),
   KEY UserId (PortalUserId),
-  KEY LastAccessed (LastAccessed)
+  KEY LastAccessed (LastAccessed),
+  KEY BrowserSignature (BrowserSignature)
 );
 
 CREATE TABLE EmailLog (
@@ -412,7 +416,7 @@
   Modified int(11) NOT NULL default '0',
   ModifiedById int(11) NOT NULL default '0',
   CachedTemplate varchar(255) NOT NULL,
-  Template varchar(255) default NULL,
+  Template varchar(255) NOT NULL default '#inherit#',
   UseExternalUrl tinyint(3) unsigned NOT NULL default '0',
   ExternalUrl varchar(255) NOT NULL default '',
   UseMenuIconUrl tinyint(3) unsigned NOT NULL default '0',
Index: branches/5.1.x/core/admin_templates/img/tab_active_back.jpg
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/catalog/catalog_counters.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/catalog/catalog_counters.tpl	(.../catalog_counters.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/catalog/catalog_counters.tpl	(.../catalog_counters.tpl)	(revision 12657)
@@ -5,7 +5,7 @@
 $Catalog.ParentCategoryID = <inp2:c_GetParentCategory/>;
 
 <inp2:m_DefineElement name="category_caption">
-	<inp2:m_ifnot check="c_HomeCategory" equals_to="$cat_id">
+	<inp2:m_ifnot check="m_Param" name="is_first">
 		<inp2:m_param name="separator"/>
 	</inp2:m_ifnot>
 	<inp2:m_if check="m_ParamEquals" name="current" value="1" inverse="1">
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_reset_to_pending_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_reset_to_pending.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_affiliate_payment_type.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_cat_deleted.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_summary_logs.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -N -r12453 -r12657
--- branches/5.1.x/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 12453)
+++ branches/5.1.x/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_cache.php 12453 2009-09-05 14:11:39Z alex $
+* @version	$Id: phrases_cache.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class PhrasesCache extends kBase {
 
 	/**
@@ -30,12 +32,76 @@
 
 	var $fromTag = false;
 
+	/**
+	 * Allows to edit existing phrases
+	 *
+	 * @var bool
+	 */
+	var $_editExisting = false;
+
+	/**
+	 * Allows to edit missing phrases
+	 *
+	 * @var bool
+	 */
+	var $_editMissing = false;
+
+	/**
+	 * Template, used for phrase adding/editing
+	 *
+	 * @var string
+	 */
+	var $_phraseEditTemplate = '';
+
+	/**
+	 * Use simplified form for phrase editing
+	 *
+	 * @var bool
+	 */
+	var $_simpleEditingMode = false;
+
+	/**
+	 * HTML tag used to translate phrases
+	 *
+	 * @var string
+	 */
+	var $_translateHtmlTag = 'a';
+
+	/**
+	 * Phrases, that are in cache, but are not in database
+	 *
+	 * @var Array
+	 */
+	var $_missingPhrases = Array ();
+
 	function PhrasesCache()
 	{
 		parent::kBase();
 		$this->Conn =& $this->Application->GetADODBConnection();
+
+		if (defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->IsAdmin()) {
+			// only has effect in admin, because on front-end phrases are translated in "Content Mode"
+			$this->_editMissing = defined('DBG_PHRASES') && DBG_PHRASES;
+		}
+
+		// now we use admin phrase editing template even on front-end
+		$this->_phraseEditTemplate = 'regional/phrases_edit';
 	}
 
+	/**
+	 * Sets phrase editing mode, that corresponds current editing mode
+	 *
+	 */
+	function setPhraseEditing()
+	{
+		if (!$this->Application->IsAdmin() && (EDITING_MODE == EDITING_MODE_CONTENT)) {
+			$this->_editExisting = true;
+			$this->_editMissing = true;
+			$this->_simpleEditingMode = true;
+			$this->_translateHtmlTag = 'span';
+		}
+	}
+
 	function Init($prefix, $special = '')
 	{
 		if (constOn('IS_INSTALL')) {
@@ -62,11 +128,13 @@
 
 	function GetCachedIds()
 	{
-		$query = sprintf("SELECT PhraseList, ConfigVariables FROM %s WHERE Template = %s",
-											TABLE_PREFIX.'PhraseCache',
-											$this->Conn->Qstr(md5($this->Application->GetVar('t').$this->Application->GetVar('m_theme').$this->Application->GetVar('m_lang'))));
-		$res = $this->Conn->GetRow($query);
+		$cache_key = md5($this->Application->GetVar('t') . $this->Application->GetVar('m_theme') . $this->Application->GetVar('m_lang'));
 
+		$sql = 'SELECT PhraseList, ConfigVariables
+				FROM ' . TABLE_PREFIX . 'PhraseCache
+				WHERE Template = ' . $this->Conn->qstr($cache_key);
+		$res = $this->Conn->GetRow($sql);
+
 		if ($res && $res['ConfigVariables']) {
 			$this->Application->OriginalConfigCacheIds =  explode(',', $res['ConfigVariables']);
 			$this->Application->ConfigCacheIds = $this->Application->OriginalConfigCacheIds;
@@ -77,24 +145,30 @@
 
 	function LoadPhrases($ids)
 	{
-		if ( !is_array($ids) || !implode('', $ids) ) return;
-		$query = sprintf("SELECT Translation,UPPER(Phrase) AS Phrase FROM %s WHERE LanguageId = %s AND PhraseId IN (%s)",
-											TABLE_PREFIX.'Phrase',
-											$this->LanguageId,
-											join(',', $ids));
-		$this->Phrases = $this->Conn->GetCol($query,'Phrase');
+		if ( !is_array($ids) || !implode('', $ids) ) {
+			return;
+		}
+
+		$sql = 'SELECT Translation, UPPER(Phrase) AS Phrase
+				FROM ' . TABLE_PREFIX . 'Phrase
+				WHERE (LanguageId = ' . $this->LanguageId . ') AND PhraseId IN (' . implode(',', $ids) . ')';
+		$this->Phrases = $this->Conn->GetCol($sql, 'Phrase');
+
 		/*foreach($phrases as $phrase => $tanslation)
 		{
 			$this->AddCachedPhrase(mb_strtoupper($phrase), $tanslation);
 		}*/
+
 		$this->Ids = $ids;
 		$this->OriginalIds = $ids;
 	}
 
-	function AddCachedPhrase($label, $value)
+	function AddCachedPhrase($label, $value, $allow_editing = true)
 	{
-		$label = mb_strtoupper($label);
-		$this->Phrases[$label] = $value;
+		// uppercase phrase name for cases, when this method is called outside this class
+		$cache_key = ($allow_editing ? '' : 'NE:') . mb_strtoupper($label);
+
+		$this->Phrases[$cache_key] = $value;
 	}
 
 	function NeedsCacheUpdate()
@@ -125,11 +199,13 @@
 		}
 	}
 
-	function GetPhrase($label)
+	function GetPhrase($label, $allow_editing = true)
 	{
-		if (!isset($this->LanguageId)) return 'impossible case';
-		//actually possible when custom field contains references to language labels and its being rebuilt in OnAfterConfigRead
-		//which is triggered by Sections rebuild, which in turn read all the configs and all of that happens BEFORE seeting the language...
+		if (!isset($this->LanguageId)) {
+			//actually possible when custom field contains references to language labels and its being rebuilt in OnAfterConfigRead
+			//which is triggered by Sections rebuild, which in turn read all the configs and all of that happens BEFORE seeting the language...
+			return 'impossible case';
+		}
 
 		// cut exclamation marks - depricated form of passing phrase name from templates
 		$label = preg_replace('/^!(.*)!$/', '\\1', $label);
@@ -140,81 +216,64 @@
 
 		$original_label = $label;
 		$label = mb_strtoupper($label);
-		if(isset($this->Phrases[$label])) {
-			$translated_label = $this->Phrases[$label];
-			// debug mode is checked directly to improve performance
-			if (defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_PHRASES_HIGHLIGHT')) {
-				if (!$this->Application->isDebugMode()) return $translated_label;
 
-				if ($this->Application->IsAdmin()) {
-					$sql = 'SELECT Module
-							FROM '.TABLE_PREFIX.'Phrase
-							WHERE (LanguageId = '.$this->LanguageId.') AND (Phrase = '.$this->Conn->qstr($label).')';
-					$this->Application->Debugger->appendHTML('Phrase: <b>'.$label.'</b>; Module: <b>'.$this->Conn->GetOne($sql).'</b>');
-//					$translated_label = $translated_label.' [m: '.$this->Conn->GetOne($sql).'; l: '.$label.']';
-				}
-				else {
-					// highlight text created via translated phrase (used to detect if text on screen is phrase or not)
-					$translated_label = '<span style="border: 1px solid #999999; background-color: #cccccc; color: #999999; ">'.$translated_label.'</span></a> <span style="color: red; background-color:#ffffcc">'.$original_label.'</span>';
-				}
+		$cache_key = ($allow_editing ? '' : 'NE:') . $label;
 
-			}
+		if (array_key_exists($cache_key, $this->Phrases)) {
+			$translated_label = $this->Phrases[$cache_key];
 
-			if (defined('DEBUG_MODE') && DEBUG_MODE &&
-					(($this->Application->IsAdmin() && constOn('DBG_PHRASES_EDIT_ADMIN')) || (!$this->Application->IsAdmin() && constOn('DBG_PHRASES_EDIT_FRONT')) ) ) {
+			if ($this->_editExisting && $allow_editing && !array_key_exists($label, $this->_missingPhrases)) {
 				// option to change translation for Labels
-				list($edit_tpl, $index_file) = $this->Application->IsAdmin() ? Array('regional/phrases_edit', 'index.php') : Array('phrases_edit', 'index.php');
+				$edit_url = 'javascript:translate_phrase(\'' . addslashes($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnPrepareUpdate\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
+				$translated_label = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Edit translation">' . $translated_label . '</' . $this->_translateHtmlTag . '>';
 
-				if ($this->Application->IsAdmin() && $this->Application->ConfigValue('UsePopups')) {
-					// link to popup when using popups (only in admin)
-					$edit_url = 'javascript:translate_phrase(\''.addslashes($translated_label).'\', \''.$edit_tpl.'\');';
+				if ($this->fromTag) {
+					$translated_label = $this->escapeTagReserved($translated_label);
 				}
-				else {
-					// direct link, when not using popups OR on frontend
-					$edit_url = $this->Application->HREF($edit_tpl,'',Array('m_opener'=>'d','phrases_label'=>$original_label,'phrases_event'=>'OnPrepareUpdate', 'pass'=>'all,phrases'), $index_file );
-				}
-				$translated_label = '<a href="'.$edit_url.'">!'.$translated_label.'!</a>';
 			}
 
 			return $translated_label;
 		}
 
-		$this->LoadPhraseByLabel($label, $original_label);
-		return $this->GetPhrase($label);
+		$this->LoadPhraseByLabel($label, $original_label, $allow_editing);
+
+		return $this->GetPhrase($label, $allow_editing);
 	}
 
-	function LoadPhraseByLabel($label, $original_label)
+	function LoadPhraseByLabel($label, $original_label, $allow_editing = true)
 	{
-		$query = sprintf("SELECT PhraseId, Translation FROM %s WHERE LanguageId = %s AND UPPER(Phrase) = UPPER(%s)",
-											TABLE_PREFIX.'Phrase',
-											$this->LanguageId,
-											$this->Conn->qstr($label));
-		$res = $this->Conn->GetRow($query);
-		if ($res === false || count($res) == 0)
-		{
-			$translation = '!'.$label.'!';
-			if($this->Application->isDebugMode() && constOn('DBG_PHRASES')) {
-				list($edit_tpl, $index_file) = $this->Application->IsAdmin() ? Array('regional/phrases_edit', 'index.php') : Array('phrases_edit', 'index.php');
+		// bug: MySQL don't use index on Phrase column, when function is used on it's value (e.g. UPPER, like in this case)
+		$sql = 'SELECT PhraseId, Translation
+				FROM ' . TABLE_PREFIX . 'Phrase
+				WHERE (LanguageId = ' . $this->LanguageId . ') AND (PhraseKey = ' . $this->Conn->qstr($label) . ')';
+		$res = $this->Conn->GetRow($sql);
 
-				if ($this->Application->IsAdmin() && $this->Application->ConfigValue('UsePopups')) {
-					// link to popup when using popups (only in admin)
-					$edit_url = 'javascript:translate_phrase(\''.addslashes($original_label).'\', \''.$edit_tpl.'\');';
+		if ($res === false || count($res) == 0) {
+			$translation = '!' . $label . '!';
+
+			if ($this->_editMissing && $allow_editing) {
+				$edit_url = 'javascript:translate_phrase(\'' . addslashes($original_label) . '\', \'' . $this->_phraseEditTemplate . '\', {event: \'OnNew\', simple_mode: ' . ($this->_simpleEditingMode ? 'true' : 'false') . '});';
+				$translation = '<' . $this->_translateHtmlTag . ' href="' . $edit_url . '" name="cms-translate-phrase" title="Translate">!' . $label . '!</' . $this->_translateHtmlTag . '>';
+
+				if ($this->fromTag) {
+					$translation = $this->escapeTagReserved($translation);
 				}
-				else {
-					// direct link, when not using popups OR on frontend
-					$edit_url = $this->Application->HREF($edit_tpl,'',Array('m_opener'=>'d','phrases_label'=>$original_label,'phrases_event'=>'OnNew', 'pass'=>'all,phrases'), $index_file );
-				}
 
-				$translation = '<a href="'.$edit_url.'">!'.$label.'!</a>';
-				if($this->fromTag) $translation = $this->escapeTagReserved($translation);
+				$this->_missingPhrases[$label] = true; // add as key for faster accessing
 			}
-			$this->AddCachedPhrase($label, $translation); //add it as already cached, as long as we dont need to cache not found phrase
+
+			// add it as already cached, as long as we dont need to cache not found phrase
+			$this->AddCachedPhrase($label, $translation, $allow_editing);
+
 			return false;
 		}
 
-		$this->Phrases[$label] = $res['Translation'];
+		$cache_key = ($allow_editing ? '' : 'NE:') . $label;
+		$this->Phrases[$cache_key] = $res['Translation'];
+
 		array_push($this->Ids, $res['PhraseId']);
-		$this->Ids = array_unique($this->Ids); //just to make sure
+		$this->Ids = array_unique($this->Ids); // just to make sure
+
 		return true;
 	}
 
@@ -242,23 +301,29 @@
 	 * @return string
 	 * @access public
 	 */
-	function ReplaceLanguageTags($text,$forse_escaping=null)
+	function ReplaceLanguageTags($text, $forse_escaping = null)
 	{
 		$this->fromTag = true;
-		if( isset($forse_escaping) ) $this->fromTag = $forse_escaping;
+		if( isset($forse_escaping) ) {
+			$this->fromTag = $forse_escaping;
+		}
+
 		preg_match_all("(!(la|lu)[^!]+!)", $text, $res, PREG_PATTERN_ORDER);
 		$language_tags = $res[0];
-		uasort($language_tags, Array(&$this, 'CmpParams') );
+		uasort($language_tags, Array(&$this, 'CmpParams'));
 
-		$values = Array();
 		$i = 0;
+		$values = Array();
+
 		foreach ($language_tags as $label) {
 			array_push($values, $this->GetPhrase($label) );
 			//array_push($values, $this->Application->Phrase($label) );
 			$language_tags[$i] = '/' . $language_tags[$i] . '/';
 			$i++;
 		}
+
 		$this->fromTag = false;
+
 		return preg_replace($language_tags, $values, $text);
 	}
 
@@ -276,7 +341,4 @@
 		return str_replace($reserved,$replacement,$text);
 	}
 
-}
-
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
Index: branches/5.1.x/core/units/general/libchart/classes/model/XYDataSet.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/model/XYDataSet.php	(.../XYDataSet.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/model/XYDataSet.php	(.../XYDataSet.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * Set of data in the form of (x, y) items.
 	 *
@@ -52,5 +54,4 @@
 		public function getPointList() {
 			return $this->pointList;
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_server_info.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_banlist.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/logs/change_logs/changes_formatter.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/logs/change_logs/changes_formatter.php	(.../changes_formatter.php)	(revision 12127)
+++ branches/5.1.x/core/units/logs/change_logs/changes_formatter.php	(.../changes_formatter.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: changes_formatter.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: changes_formatter.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,40 +12,42 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-class kChangesFormatter extends kFormatter {
+	defined('FULL_PATH') or die('restricted access!');
 
-	function Format($value, $field_name, &$object, $format=null)
-	{
-		if ( is_null($value) ) {
-			return '';
-		}
+	class kChangesFormatter extends kFormatter {
 
-		$changes = unserialize($value);
+		function Format($value, $field_name, &$object, $format=null)
+		{
+			if ( is_null($value) ) {
+				return '';
+			}
 
-		$res = '';
-		if (!$changes) {
-			return ;
-		}
+			$changes = unserialize($value);
 
-		foreach ($changes as $field => $data) {
-			$fld_translation = $this->Application->Phrase('la_fld_'.$field);
+			$res = '';
+			if (!$changes) {
+				return ;
+			}
 
-			// remove translation link (added in debug mode)
-			$fld_translation = preg_replace('/<a href="(.*?)">(.*?)<\/a>/', '\\2', $fld_translation);
+			foreach ($changes as $field => $data) {
+				$fld_translation = $this->Application->Phrase('la_fld_'.$field);
 
-			if ($fld_translation == '!'.strtoupper('la_fld_'.$field).'!') {
-				// when phrase is not translated use field name as label
-				$fld_translation = $field;
-			}
+				// remove translation link (added in debug mode)
+				$fld_translation = preg_replace('/<a href="(.*?)">(.*?)<\/a>/', '\\2', $fld_translation);
 
-			if (is_array($data) && isset($data['old']) && isset($data['new'])) {
-				$res .= "$fld_translation: {$data['old']} => {$data['new']}<br/>\n";
+				if ($fld_translation == '!'.strtoupper('la_fld_'.$field).'!') {
+					// when phrase is not translated use field name as label
+					$fld_translation = $field;
+				}
+
+				if (is_array($data) && isset($data['old']) && isset($data['new'])) {
+					$res .= "$fld_translation: {$data['old']} => {$data['new']}<br/>\n";
+				}
+				else {
+					$res .= "$fld_translation: {$data['new']}<br/>\n";
+				}
 			}
-			else {
-				$res .= "$fld_translation: {$data['new']}<br/>\n";
-			}
+			return $res;
 		}
-		return $res;
-	}
 
-}
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_search_log.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_style.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_cat_pick.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/config/config_email.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/config/config_email.tpl	(.../config_email.tpl)	(revision 12657)
@@ -7,43 +7,77 @@
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
-  	<td>
-  		<script type="text/javascript">
-  			//do not rename - this function is used in default grid for double click!
-  			function edit()
-  			{
-  				openSelector('emailevents.module', '<inp2:m_t t="user_selector" pass="all,emailevents.module" escape="1"/>', 'FromUserId', null, 'OnSaveSelected');
-  			}
+  		<td>
+	  		<script type="text/javascript">
+				//do not rename - this function is used in default grid for double click!
+	  			function edit() {
+	  				Application.SetVar('remove_specials[emailevents.module]', 1);
+	  				std_edit_item('emailevents.module', 'config/config_email_edit');
+	  			}
 
-  			var a_toolbar = new ToolBar();
+	  			var a_toolbar = new ToolBar();
 
-				a_toolbar.AddButton( new ToolBarButton('usertogroup', '<inp2:m_phrase label="la_ToolTip_SelectUser" escape="1"/>', edit
-				 ) );
+	  			a_toolbar.AddButton(
+					new ToolBarButton(
+						'edit',
+						'<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>',
+						edit
+					)
+				);
 
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'select_user',
+						'<inp2:m_phrase label="la_ToolTip_SelectUser" escape="1"/>',
+						function () {
+							openSelector('emailevents.module', '<inp2:m_t t="user_selector" pass="all,emailevents.module" escape="1"/>', 'FromUserId', null, 'OnSaveSelected');
+						}
+					)
+				);
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Enable" escape="1"/>', function() {
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'approve',
+						'<inp2:m_phrase label="la_ToolTip_Enable" escape="1"/>',
+						function() {
 							submit_event('emailevents.module','OnMassApprove');
 						}
-				 ) );
+					)
+				);
 
-				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Disable" escape="1"/>', function() {
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'decline',
+						'<inp2:m_phrase label="la_ToolTip_Disable" escape="1"/>',
+						function() {
 							submit_event('emailevents.module','OnMassDecline');
 						}
-				 ) );
+					)
+				);
 
-				a_toolbar.AddButton( new ToolBarButton('frontend_mail', '<inp2:m_phrase label="la_ToolTip_Email_FrontOnly" escape="1"/>', function() {
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'frontend_mail',
+						'<inp2:m_phrase label="la_ToolTip_Email_FrontOnly" escape="1"/>',
+						function() {
 							submit_event('emailevents.module','OnFrontOnly');
 						}
-				 ) );
+					)
+				);
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'view',
+						'<inp2:m_phrase label="la_ToolTip_View" escape="1"/>',
+						function() {
 							show_viewmenu(a_toolbar,'view');
 						}
-				) );
+					)
+				);
 
 				a_toolbar.Render();
 			</script>
@@ -53,11 +87,19 @@
 </tbody>
 </table>
 
+<inp2:m_DefineElement name="from_user_td">
+	<inp2:m_if check="Field" name="$field" db="db" equals_to="">
+		Root
+	<inp2:m_else/>
+		<inp2:Field name="$field"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_RenderElement name="grid" PrefixSpecial="emailevents.module" IdField="EventId" grid="EmailSettings" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['emailevents.module'].SetDependantToolbarButtons( new Array('frontend_mail','usertogroup','approve','decline') );
+	Grids['emailevents.module'].SetDependantToolbarButtons( new Array('frontend_mail', 'select_user', 'approve', 'decline', 'edit') );
 </script>
 
-<input type="hidden" name="emailevents.module_PopupSelectedUser" value="">
+<input type="hidden" name="emailevents.module_PopupSelectedUser" value=""/>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_manufacturer_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_language_disabled.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/modules/modules_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: modules_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: modules_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class ModulesEventHandler extends kDBEventHandler {
 
 		/**
@@ -85,7 +87,12 @@
 				$object->SetDBField($status_field, $event->Name == 'OnMassApprove' ? 1 : 0);
 
 				if ($object->Update()) {
-					$event->status = erSUCCESS;
+					$sql = 'UPDATE ' . TABLE_PREFIX . 'ImportScripts
+								SET Status = ' . ($event->Name == 'OnMassApprove' ? STATUS_ACTIVE : STATUS_DISABLED) . '
+ 								WHERE Module = "' . $object->GetDBField('Name') . '"';
+ 					$this->Conn->Query($sql);
+
+ 					$event->status = erSUCCESS;
 					$event->redirect_params = Array('opener' => 's'); //stay!
 				}
 				else {
@@ -109,7 +116,7 @@
 			parent::OnAfterListQuery($event);
 
 			$new_modules = $this->_getNewModules();
-			if (!$new_modules) {
+			if (!$new_modules || $this->Application->RecallVar('user_id') != -1) {
 				return ;
 			}
 
@@ -123,8 +130,10 @@
 			foreach ($new_modules as $module) {
 				$module_record = Array (
 					'Name' => $toolkit->getModuleName($module),
-					'Loaded' => 0,
+					'Path' => $module . '/',
 					'Version' => $toolkit->GetMaxModuleVersion($module),
+					'Loaded' => 0,
+					'BuildDate' => null,
 				);
 
 				$object->addRecord($module_record);
@@ -174,6 +183,4 @@
 		{
 			return file_exists($folder . '/install.php') && file_exists($folder . '/install/install_schema.sql');
 		}
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/themes/themes_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/themes/themes_list.tpl	(.../themes_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/themes/themes_list.tpl	(.../themes_list.tpl)	(revision 12657)
@@ -14,7 +14,7 @@
   			}
 
   			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_theme', '<inp2:m_phrase label="la_ToolTip_NewTheme" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewTheme" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							std_precreate_item('theme', 'themes/themes_edit')
 						} ) );
@@ -28,12 +28,12 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-				a_toolbar.AddButton( new ToolBarButton('primary_theme', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
 							submit_event('theme','OnSetPrimary');
 						}
 				 ) );
 
-				a_toolbar.AddButton( new ToolBarButton('rescan_themes', '<inp2:m_phrase label="la_ToolTip_RescanThemes" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_RescanThemes" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_RescanThemes" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_RescanThemes" escape="1"/>', function() {
 							submit_event('adm', 'OnRebuildThemes');
 						}
 				 ) );
@@ -56,7 +56,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="theme" IdField="ThemeId" grid="Default" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['theme'].SetDependantToolbarButtons( new Array('edit','delete','primary_theme') );
+	Grids['theme'].SetDependantToolbarButtons( new Array('edit', 'delete', 'setprimary') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.1.x/core/units/relationship/relationship_tp.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/relationship/relationship_tp.php	(.../relationship_tp.php)	(revision 12127)
+++ branches/5.1.x/core/units/relationship/relationship_tp.php	(.../relationship_tp.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: relationship_tp.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: relationship_tp.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class RelationshipTagProcessor extends kDBTagProcessor {
 
 		/**
@@ -31,4 +33,5 @@
 
 			return parent::SaveWarning($params);
 		}
+
 	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_advanced_view.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/general/brackets.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/general/brackets.php	(revision 12127)
+++ branches/5.1.x/core/units/general/brackets.php	(revision 0)
@@ -1,470 +0,0 @@
-<?php
-/**
-* @version	$Id: brackets.php 11892 2009-07-01 08:35:06Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	class kBracketsHelper extends kHelper {
-
-		/**
-		 * Field name holding minimal amount
-		 *
-		 * @var string
-		 */
-		var $min_field = '';
-
-		/**
-		 * Field name holding maximal amount
-		 *
-		 * @var string
-		 */
-		var $max_field = '';
-
-		/**
-		 * Default values to be set to automtically created price brackets
-		 *
-		 * @var Array
-		 */
-		var $default_values = Array();
-
-		var $defaultStartValue = 1;
-
-		/**
-		 * Decimal separator
-		 *
-		 * @var string
-		 */
-		var $_decimalSeparator = '';
-
-		/**
-		 * Thousands separator
-		 *
-		 * @var string
-		 */
-		var $_thousandsSeparator = '';
-
-		/**
-		 * Current language
-		 *
-		 * @var LanguagesItem
-		 */
-		var $_language = null;
-
-		function kBracketsHelper()
-		{
-			parent::kHelper();
-
-			$this->_language =& $this->Application->recallObject('lang.current');
-			/* @var $lang kDBItem */
-
-			$this->_decimalSeparator = $this->_language->GetDBField('DecimalPoint');
-			$this->_thousandsSeparator = $this->_language->GetDBField('ThousandSep');
-		}
-
-		function InitHelper($min_field, $max_field, $default_values, $default_start_value = null)
-		{
-			$this->min_field = $min_field;
-			$this->max_field = $max_field;
-			$this->default_values = $default_values;
-
-			if (isset($default_start_value)) {
-				$this->defaultStartValue = $default_start_value;
-			}
-		}
-
-		/**
-		 * Converts number to operatable form
-		 *
-		 * @param string $value
-		 * @return float
-		 */
-		function _parseNumber($value)
-		{
-			$value = str_replace($this->_thousandsSeparator, '', $value);
-			$value = str_replace($this->_decimalSeparator, '.', $value);
-
-			return $value;
-		}
-
-		/**
-		 * Returns brackets from form with all numbers parsed
-		 *
-		 * @param kEvent $event
-		 * @return Array
-		 */
-		function getBrackets(&$event)
-		{
-			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-
-			return $this->parseBrackets($items_info);
-		}
-
-		function parseBrackets($brackets)
-		{
-			if (!$brackets) {
-				return $brackets;
-			}
-
-			foreach ($brackets as $id => $field_values) {
-				if (strlen($brackets[$id][$this->min_field])) {
-					$brackets[$id][$this->min_field] = (float)$this->_parseNumber($brackets[$id][$this->min_field]);
-				}
-
-				if (strlen($brackets[$id][$this->max_field])) {
-					$brackets[$id][$this->max_field] = (float)$this->_parseNumber($brackets[$id][$this->max_field]);
-				}
-			}
-
-			return $brackets;
-		}
-
-		/**
-		 * Formats given brackets and sets them back to request
-		 *
-		 * @param kEvent $event
-		 * @param Array $brackets
-		 */
-		function setBrackets(&$event, $brackets)
-		{
-			$brackets = $this->formatBrackets($brackets);
-
-			$this->Application->SetVar($event->getPrefixSpecial(true), $brackets);
-		}
-
-		function formatBrackets($brackets)
-		{
-			if (!$brackets) {
-				return $brackets;
-			}
-
-			foreach ($brackets as $id => $field_values) {
-				if (strlen($brackets[$id][$this->min_field])) {
-					$brackets[$id][$this->min_field] = $this->_language->formatNumber($brackets[$id][$this->min_field]);
-				}
-
-				if (strlen($brackets[$id][$this->max_field])) {
-					$brackets[$id][$this->max_field] = $this->_language->formatNumber($brackets[$id][$this->max_field]);
-				}
-			}
-
-			return $brackets;
-		}
-
-		/**
-		 * Adds 5 more empty brackets to brackets
-		 *
-		 * @param kEvent $event
-		 */
-		function OnMoreBrackets(&$event)
-		{
-			$field_values = $this->getBrackets($event);
-
-			$object =& $event->getObject();
-
-			foreach($field_values as $id => $record)
-			{
-				if($record[$this->max_field] == '&#8734;') $field_values[$id][$this->max_field] = -1;
-			}
-
-			$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$object->IDField.') FROM '.$object->TableName);
-			if($new_id > 0) $new_id = 0;
-			do
-			{
-				$new_id--;
-			}while( $this->arraySearch($field_values, $object->IDField, $new_id) );
-
-
-			$last_max_qty = $this->Conn->GetOne('SELECT MAX('.$this->max_field.') FROM '.$object->TableName);
-			$min_qty = $this->Conn->GetOne('SELECT MIN('.$this->max_field.') FROM '.$object->TableName);
-
-			if($min_qty == -1) $last_max_qty = -1;
-			if(!$last_max_qty) $last_max_qty = $this->defaultStartValue;
-
-
-			for($i = $new_id; $i > $new_id - 5; $i--)
-			{
-				$field_values[$i][$object->IDField] = $i;
-				$field_values[$i][$this->min_field] = ($i == $new_id-4 && $last_max_qty != -1) ? $last_max_qty : '';
-				$field_values[$i][$this->max_field] = ($i == $new_id-4 && $last_max_qty != -1) ? -1 : '';
-				$field_values[$i] = array_merge_recursive2($field_values[$i], $this->default_values);
-			}
-
-			$event->CallSubEvent('OnPreSaveBrackets');
-
-			$this->setBrackets($event, $field_values);
-		}
-
-		/**
-		 * Adds infinity bracket
-		 *
-		 * @param kEvent $event
-		 */
-		function OnInfinity(&$event)
-		{
-			$object =& $event->getObject();
-			$infinite_exists = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName.' WHERE '.$this->max_field.' = -1');
-			$field_values = $this->getBrackets($event);
-			/*if(is_array($field_values))
-			{
-				foreach($field_values as $values)
-				{
-					$infinite_exists = $infinite_exists || ($values[$this->max_field] == -1);
-				}
-			}*/
-
-			if ($infinite_exists == 0) {
-				reset($field_values);
-				$last_bracket = end($field_values);
-				$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$object->IDField.') FROM '.$object->TableName);
-
-				$brackets_exist = (int)$this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName);
-
-				if($new_id > 0) $new_id = 0;
-				do
-				{
-					$new_id--;
-				}while( $this->arraySearch($field_values, $object->IDField, $new_id) );
-
-				$infinite_bracket[$object->IDField] = $new_id;
-				$infinite_bracket[$this->min_field] = ($brackets_exist > 0) ? $last_bracket[$this->max_field] : $this->defaultStartValue;
-				$infinite_bracket[$this->max_field] = '-1';
-				$infinite_bracket = array_merge_recursive2($infinite_bracket, $this->default_values);
-
-				$field_values[$new_id] = $infinite_bracket;
-				reset($field_values);
-
-				$this->setBrackets($event, $field_values);
-			}
-		}
-
-		/**
-		 * Saves brackets to database
-		 *
-		 * @param kEvent $event
-		 */
-		function OnPreSaveBrackets(&$event)
-		{
-			$items_info = $this->getBrackets($event);
-			if ($items_info) {
-				$object =& $event->getObject();
-
-				$linked_info = $object->getLinkedInfo();
-				$stored_ids = $this->Conn->GetCol('SELECT '.$object->IDField.' FROM '.$object->TableName.' WHERE '.$linked_info['ForeignKey'].' = '.$linked_info['ParentId']);
-
-				uasort($items_info, Array(&$this, 'compareBrackets') );
-
-				foreach ($items_info as $item_id => $values) {
-
-					if (in_array($item_id, $stored_ids)) { //if it's already exist
-						$object->SetDefaultValues();
-						$object->Load($item_id);
-						$object->SetFieldsFromHash($values);
-						if (!$object->Validate()) {
-							unset($stored_ids[array_search($item_id, $stored_ids)]);
-							$event->redirect = false;
-							continue;
-						}
-						if( $object->Update($item_id) )
-						{
-							$event->status = erSUCCESS;
-						}
-						else
-						{
-							$event->status = erFAIL;
-							$event->redirect = false;
-							break;
-						}
-						unset( $stored_ids[ array_search($item_id, $stored_ids) ] );
-					}
-					else {
-						$object->SetDefaultValues();
-						$object->SetFieldsFromHash($values);
-						$object->SetDBField($linked_info['ForeignKey'], $linked_info['ParentId']);
-
-						if( $object->Create() )
-						{
-							$object->setTempID();
-							$event->status = erSUCCESS;
-						}
-					}
-				}
-
-				// delete
-				foreach ($stored_ids as $stored_id)
-				{
-					$this->Conn->Query('DELETE FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$stored_id);
-				}
-
-			}
-		}
-
-		function arrangeBrackets(&$event)
-		{
-			$object =& $event->getObject();
-
-			$temp = $this->getBrackets($event);
-
-			foreach($temp as $id => $record)
-			{
-				if( $record[$this->max_field] == '&#8734;' )
-				{
-					$temp[$id][$this->max_field] = -1;
-				}
-			}
-
-			$temp_orig = $temp;
-			reset($temp);
-			if( is_array($temp) )
-			{
-				// array to store max values (2nd column)
-				$end_values = Array();
-
-				// get minimal value of Min
-				$first_elem = current($temp);
-				$start = $first_elem[$this->min_field];
-				if (!strlen($start)) {
-					$start = $this->defaultStartValue;
-				}
-
-				foreach($temp as $id => $record)
-				{
-					if(
-					// MAX is less than start
-					($record[$this->max_field] <= $start && $record[$this->max_field] != -1) ||
-					// Max is empty
-					!strlen($record[$this->max_field]) ||
-					// Max already defined in $end_values
-					(array_search($record[$this->max_field], $end_values) !== false)
-					) {	// then delete from brackets list
-						unset($temp[$id]);
-					}
-					else {	// this is when ok - add to end_values list
-						$end_values[] = $record[$this->max_field];
-					}
-				}
-
-				// sort brackets by 2nd column (Max values)
-				uasort($temp, Array(&$this, 'compareBrackets') );
-				reset($temp);
-				$first_item = each($temp);
-				$first_item_key = $first_item['key'];
-
-				$linked_info = $object->getLinkedInfo();
-				$sql = 'SELECT %s FROM %s WHERE %s = %s';
-				$ids = $this->Conn->GetCol( sprintf($sql, $object->IDField, $object->TableName, $linked_info['ForeignKey'], $linked_info['ParentId']) );
-				if( is_array($ids) )
-				{
-					usort($ids, Array(&$this, 'sortBracketIDs') );
-				}
-
-//				$min_id = min( min($ids) - 1, -1 );
-
-				foreach($temp as $key => $record)
-				{
-					$temp[$key][$this->min_field] = $start;
-					$start = $temp[$key][$this->max_field];
-				}
-			}
-
-			$this->setBrackets($event, $temp);
-
-			return $temp;
-		}
-
-		function compareBrackets($bracket1, $bracket2) // ap_bracket_comp
-		{
-			$bracket1_min = $bracket1[$this->min_field];
-			$bracket1_max = $bracket1[$this->max_field];
-
-			$bracket2_min = $bracket2[$this->min_field];
-			$bracket2_max = $bracket2[$this->max_field];
-
-			// limits
-			if( ($bracket1_min != '') && ($bracket1_max == '') && ($bracket2_min != '') && ($bracket2_max != '') ) return 1;
-			if( ($bracket1_min != '') && ($bracket1_max == '') && ($bracket2_min == '') && ($bracket2_max == '') ) return -1;
-			if( ($bracket1_max == '') && ($bracket2_max != '') ) return 1;
-			if( ($bracket1_max != '') && ($bracket2_max == '') ) return -1;
-
-
-			if( ( ($bracket1_max > $bracket2_max) && ($bracket2_max != -1) ) || ( ($bracket1_max == -1) && ($bracket2_max != -1) ) )
-			{
-				return 1;
-			}
-			elseif( ($bracket1_max < $bracket2_max) || ( ($bracket2_max == -1) && ($bracket1_max != -1) ) )
-			{
-				return -1;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-
-		function sortBracketIDs($first_id, $second_id) // pr_bracket_id_sort
-		{
-			$first_abs = abs($first_id);
-			$second_abs = abs($second_id);
-
-			$first_sign = ($first_id == 0) ? 0 : $first_id / $first_abs;
-			$second_sign = ($second_id == 0) ? 0 : $second_id / $second_abs;
-
-			if($first_sign != $second_sign)
-			{
-				if($first_id > $second_id)
-				{
-					$bigger =& $first_abs;
-					$smaller =& $second_abs;
-				}
-				else
-				{
-					$bigger =& $second_abs;
-					$smaller =& $first_abs;
-				}
-				$smaller = $bigger + $smaller;
-			}
-
-			return ($first_abs > $second_abs) ? 1 : ($first_abs < $second_abs ? -1 : 0);
-		}
-
-		/**
-		 * Searches through submitted grid data to find record with specific value in specific field
-		 *
-		 * @param Array $records // grid data from REQUEST
-		 * @param string $field
-		 * @param string $value
-		 * @return bool
-		 */
-		function arraySearch($records, $field, $value) // check_array
-		{
-			foreach ($records as $record)
-			{
-				if ($record[$field] == $value)
-				{
-					return true;
-				}
-			}
-			return false;
-		}
-
-		/**
-		 * Replate infinity mark with -1 before saving to db
-		 *
-		 * @param kEvent $event
-		 */
-		function replaceInfinity(&$event)
-		{
-			$object =& $event->getObject();
-			if($object->GetDBField($this->max_field) == '&#8734;') $object->SetDBField($this->max_field, -1);
-		}
-
-	}
-
-?>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_site.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_form_submission_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/fck/fck_eh.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/fck/fck_eh.php	(.../fck_eh.php)	(revision 12127)
+++ branches/5.1.x/core/units/fck/fck_eh.php	(.../fck_eh.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: fck_eh.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: fck_eh.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,26 +12,10 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class FckEventHandler extends kDBEventHandler {
 
-
-		function mapPermissions()
-		{
-			parent::mapPermissions();
-
-			$permissions = array(
-				'OnLoadCmsTree'			=> array('self' => true),
-				'OnLoadResources'		=> array('self' => true),
-				'OnRenameFile'			=> array('self' => true),
-				'OnDeleteFiles'			=> array('self' => true),
-				'OnGetFoldersFilesList'	=> array('self' => true),
-				'OnCreateFolder'		=> array('self' => true),
-				'OnUploadFile'			=> array('self' => true),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
-		}
-
 		/**
 		 * Checks permissions of user
 		 *
@@ -40,6 +24,7 @@
 		function CheckPermission(&$event)
 		{
 			if ($this->Application->LoggedIn() && $this->Application->IsAdmin()) {
+				// this limits all event execution only to logged-in users in admin
 				return true;
 			}
 
@@ -98,106 +83,106 @@
 	}
 
 
-	function OnRenameFile(&$event)
-	{
-		$event->status = erSTOP;
-		$old_name = $this->Application->GetVar('old_name');
-		$new_name = $this->Application->GetVar('new_name');
-		$folder = $this->Application->GetVar('folder');
-		$sServerDir = WRITEABLE.'/user_files/'.$folder.'/';
+		function OnRenameFile(&$event)
+		{
+			$event->status = erSTOP;
+			$old_name = $this->Application->GetVar('old_name');
+			$new_name = $this->Application->GetVar('new_name');
+			$folder = $this->Application->GetVar('folder');
+			$sServerDir = WRITEABLE . '/user_files/' . $folder . '/';
 
-		if (!file_exists($sServerDir.$old_name) || !is_file($sServerDir.$old_name)) {
-			echo 204;
-			return;
-		}
+			if (!file_exists($sServerDir.$old_name) || !is_file($sServerDir.$old_name)) {
+				echo 204;
+				return;
+			}
 
-		$fck_helper =& $this->Application->recallObject('FCKHelper');
-		/* @var fck_helper fckFCKHelper*/
+			$fck_helper =& $this->Application->recallObject('FCKHelper');
+			/* @var fck_helper fckFCKHelper*/
 
-		if (!$fck_helper->IsAllowedExtension($folder, $new_name)) {
-			echo 203;
-			return;
-		}
+			if (!$fck_helper->IsAllowedExtension($folder, $new_name)) {
+				echo 203;
+				return;
+			}
 
-		if (!rename($sServerDir.$old_name,$sServerDir.$new_name)) {
-//			echo $sServerDir.$old_name.' -> '.$sServerDir.$new_name;
-			echo 205;
-			return;
+			if (!rename($sServerDir.$old_name,$sServerDir.$new_name)) {
+	//			echo $sServerDir.$old_name.' -> '.$sServerDir.$new_name;
+				echo 205;
+				return;
+			}
+
+			echo '0';
 		}
 
-		echo '0';
-	}
 
+		function OnDeleteFiles(&$event)
+		{
+			$event->status = erSTOP;
+			$files = trim($this->Application->GetVar('files'),'|');
+	//		echo $files;
+			$a_files = explode('|', $files);
+			$folder = $this->Application->GetVar('folder');
+			$sServerDir = WRITEABLE . '/user_files/' . $folder . '/';
 
-	function OnDeleteFiles(&$event)
-	{
-		$event->status = erSTOP;
-		$files = trim($this->Application->GetVar('files'),'|');
-//		echo $files;
-		$a_files = explode('|', $files);
-		$folder = $this->Application->GetVar('folder');
-		$sServerDir = WRITEABLE.'/user_files/'.$folder.'/';
+			foreach ($a_files AS $file) {
+				@unlink($sServerDir.$file);
+			}
 
-		foreach ($a_files AS $file) {
-			@unlink($sServerDir.$file);
+	//		print_r($a_files);
 		}
 
-//		print_r($a_files);
-	}
+		function OnGetFoldersFilesList(&$event)
+		{
+			$this->CreateXmlHeader();
+			$fck_helper =& $this->Application->recallObject('FCKHelper');
+			/* @var fck_helper fckFCKHelper*/
 
-	function OnGetFoldersFilesList(&$event)
-	{
-		$this->CreateXmlHeader();
-		$fck_helper =& $this->Application->recallObject('FCKHelper');
-		/* @var fck_helper fckFCKHelper*/
+			$ret = '<?xml version="1.0" encoding="utf-8" ?>'."\n" ;
+			$ret .= "<content>"."\n";
+			$ret .= $fck_helper->PrintFolders();
+			$ret .= $fck_helper->PrintFiles();
+			$ret .= "</content>"."\n";
+			echo $ret;
+			exit;
+		}
 
-		$ret = '<?xml version="1.0" encoding="utf-8" ?>'."\n" ;
-		$ret .= "<content>"."\n";
-		$ret .= $fck_helper->PrintFolders();
-		$ret .= $fck_helper->PrintFiles();
-		$ret .= "</content>"."\n";
-		echo $ret;
-		exit;
-	}
 
+		function OnCreateFolder(&$event)
+		{
+			$event->status = erSTOP;
 
-	function OnCreateFolder(&$event)
-	{
-		$event->status = erSTOP;
+			$new_folder 	= $this->Application->GetVar('new_folder');
+			$current_folder	= $this->Application->GetVar('current_folder');
+			$folderPath = WRITEABLE . '/user_files' . '/' . $current_folder . "/" . $new_folder;
+			if ( file_exists( $folderPath ) && is_dir($folderPath)) {
+				echo "101";
+			}
 
-		$new_folder 	= $this->Application->GetVar('new_folder');
-		$current_folder	= $this->Application->GetVar('current_folder');
-		$folderPath = WRITEABLE.'/user_files'.'/'.$current_folder."/".$new_folder;
-		if ( file_exists( $folderPath ) && is_dir($folderPath)) {
-			echo "101";
+			if ( !file_exists( $folderPath ) )
+			{
+				// Turn off all error reporting.
+				error_reporting( 0 ) ;
+				// Enable error tracking to catch the error.
+				ini_set( 'track_errors', '1' ) ;
+				// To create the folder with 0777 permissions, we need to set umask to zero.
+				$oldumask = umask(0) ;
+				mkdir( $folderPath, 0777 ) ;
+				umask( $oldumask ) ;
+				$sErrorMsg = $php_errormsg ;
+				// Restore the configurations.
+				ini_restore( 'track_errors' ) ;
+				ini_restore( 'error_reporting' ) ;
+				if ($sErrorMsg)
+					echo  $sErrorMsg ;
+				else
+					echo '0';
+			}
 		}
 
-		if ( !file_exists( $folderPath ) )
+		function OnUploadFile(&$event)
 		{
-			// Turn off all error reporting.
-			error_reporting( 0 ) ;
-			// Enable error tracking to catch the error.
-			ini_set( 'track_errors', '1' ) ;
-			// To create the folder with 0777 permissions, we need to set umask to zero.
-			$oldumask = umask(0) ;
-			mkdir( $folderPath, 0777 ) ;
-			umask( $oldumask ) ;
-			$sErrorMsg = $php_errormsg ;
-			// Restore the configurations.
-			ini_restore( 'track_errors' ) ;
-			ini_restore( 'error_reporting' ) ;
-			if ($sErrorMsg)
-				echo  $sErrorMsg ;
-			else
-				echo '0';
+			$event->status = erSTOP;
+			$fck_helper =& $this->Application->recallObject('FCKHelper');
+			/* @var fck_helper fckFCKHelper*/
+			$fck_helper->UploadFile();
 		}
-	}
-
-	function OnUploadFile(&$event)
-	{
-		$event->status = erSTOP;
-		$fck_helper =& $this->Application->recallObject('FCKHelper');
-		/* @var fck_helper fckFCKHelper*/
-		$fck_helper->UploadFile();
-	}
-}
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_theme.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_group_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/tab_back3.jpg
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_more_brackets.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r12453 -r12657
--- branches/5.1.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 12453)
+++ branches/5.1.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_tag_processor.php 12453 2009-09-05 14:11:39Z alex $
+* @version	$Id: admin_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class AdminTagProcessor extends kDBTagProcessor {
 
 		function SetConst($params)
@@ -711,9 +713,26 @@
 			return $popup_info['PopupWidth'].'x'.$popup_info['PopupHeight'];
 		}
 
+		/**
+		 * Allows to check if popups are generally enabled OR to check for "popup" or "modal" mode is enabled
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
 		function UsePopups($params)
 		{
-			return (int)$this->Application->ConfigValue('UsePopups') || $this->Application->GetVar('_force_popup');
+			if ($this->Application->GetVar('_force_popup')) {
+				return true;
+			}
+
+			$use_popups = (int)$this->Application->ConfigValue('UsePopups');
+
+			if (array_key_exists('mode', $params)) {
+				$mode_mapping = Array ('popup' => 1, 'modal' => 2);
+				return $use_popups == $mode_mapping[ $params['mode'] ];
+			}
+
+			return $use_popups;
 		}
 
 		function UseToolbarLabels($params)
@@ -805,68 +824,10 @@
 
 		function AdminSkin($params)
 		{
-			static $style;
-			if (!isset($style)) {
-				$style =  $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'Skins WHERE IsPrimary = 1');
-			}
+			$skin_helper =& $this->Application->recallObject('SkinHelper');
+			/* @var $skin_helper SkinHelper */
 
-			$css_path = (defined('WRITEABLE') ? WRITEABLE : FULL_PATH. DIRECTORY_SEPARATOR . 'kernel') . DIRECTORY_SEPARATOR . 'user_files';
-			$css_url = $this->Application->BaseURL(defined('WRITEBALE_BASE') ? str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE) : '/kernel') . 'user_files/';
-
-			$type = array_key_exists('type', $params) ? $params['type'] : false;
-			if ($type == 'logo') {
-				$type = 'Logo';
-			}
-
-			if ($type == 'Logo' || $type == 'LogoBottom' || $type == 'LogoLogin') {
-				return $style[$type] ? $css_url.$style[$type] : '';
-			}
-
-			$last_compiled = $style['LastCompiled'];
-
-			$style_name = mb_strtolower( $style['Name'] );
-
-			if( file_exists($css_path.'/'.'admin-'.$style_name.'-'.$last_compiled.'.css') )
-			{
-				$ret = $css_url.'admin-'.$style_name.'-'.$last_compiled.'.css';
-
-			}
-			else
-			{
-				// search for previously compiled stylesheet
-				$last_compiled = 0;
-				if( $dh = opendir($css_path) )
-				{
-					while( ($file = readdir($dh)) !== false )
-					{
-						if( preg_match('/admin-(.*)-([\d]+).css/', $file, $rets) )
-						{
-							if( $rets[1] == $style_name && $rets[2] > $last_compiled ) $last_compiled = $rets[2];
-						}
-					}
-					closedir($dh);
-				}
-				if ($last_compiled) {
-					// found
-					$ret = $css_url.'admin-'.$style_name.'-'.$last_compiled.'.css';
-				}
-				else {
-					// not found (try to compile on the fly)
-					$object =& $this->Application->recallObject('skin.-item', null, Array ('skip_autoload' => true));
-					/* @var $object kDBItem */
-
-					$skin_eh =& $this->Application->recallObject('skin_EventHandler');
-					/* @var $skin_eh SkinEventHandler */
-
-					$object->Load(1, 'IsPrimary');
-					$skin_eh->Compile($object);
-					$ret = $css_url.'admin-'.$style_name.'-'.adodb_mktime().'.css';
-				}
-			}
-
-			if (isset($params['file_only'])) return $ret;
-
-			return '<link rel="stylesheet" rev="stylesheet" href="'.$ret.'" type="text/css" media="screen" />';
+			return $skin_helper->AdminSkinTag($params);
 		}
 
 		function PrintCompileErrors($params)
@@ -1148,6 +1109,65 @@
 			$this->Application->Phrases->LanguageId = $params['language_id'];
 			$this->Application->Phrases->LoadPhrases( $this->Application->Caches['PhraseList'] );
 		}
-	}
 
-?>
\ No newline at end of file
+		/**
+		 * Performs HTTP Authentification for administrative console
+		 *
+		 * @param Array $params
+		 */
+		function HTTPAuth($params)
+		{
+			if (!$this->Application->ConfigValue('UseHTTPAuth')) {
+				// http authentification not required
+				return true;
+			}
+
+			$super_admin_ips = defined('SA_IP') ? SA_IP : false;
+			$auth_bypass_ips = $this->Application->ConfigValue('HTTPAuthBypassIPs');
+
+			if (($auth_bypass_ips && ipMatch($auth_bypass_ips)) || ($super_admin_ips && ipMatch($super_admin_ips))) {
+				// user ip is in ip bypass list
+				return true;
+			}
+
+			if (!array_key_exists('PHP_AUTH_USER', $_SERVER)) {
+				// ask user to authentificate, when not authentificated before
+				return $this->_httpAuthentificate();
+			}
+			else {
+				// validate user credentials (browsers remembers user/password
+				// and sends them each time page is visited, so no need to save
+				// authentification result in session)
+				if ($this->Application->ConfigValue('HTTPAuthUsername') != $_SERVER['PHP_AUTH_USER']) {
+					// incorrect username
+					return $this->_httpAuthentificate();
+				}
+
+				$password_formatter =& $this->Application->recallObject('kPasswordFormatter');
+				/* @var $password_formatter kPasswordFormatter */
+
+				$password = $password_formatter->EncryptPassword($_SERVER['PHP_AUTH_PW'], 'b38');
+
+				if ($this->Application->ConfigValue('HTTPAuthPassword') != $password) {
+					// incorrect password
+					return $this->_httpAuthentificate();
+				}
+			}
+
+			return true;
+		}
+
+		/**
+		 * Ask user to authentificate
+		 *
+		 * @return false
+		 */
+		function _httpAuthentificate()
+		{
+			$realm = strip_tags( $this->Application->ConfigValue('Site_Name') );
+			header('WWW-Authenticate: Basic realm="' . $realm . '"');
+			header('HTTP/1.0 401 Unauthorized');
+
+			return false;
+		}
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: selectors_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: selectors_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 safeDefine('STYLE_BASE', 	1);
 safeDefine('STYLE_BLOCK', 	2);
 
@@ -375,6 +377,4 @@
 				}
 			}
 		}
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/system/cache/dummy
===================================================================
diff -u -N
--- branches/5.1.x/system/cache/dummy	(revision 12127)
+++ branches/5.1.x/system/cache/dummy	(revision 0)
@@ -1 +0,0 @@
-dummy
\ No newline at end of file
Index: branches/5.1.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: configuration_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,9 +12,10 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class ConfigurationEventHandler extends kDBEventHandler  {
 
-
 		/**
 		 * Changes permission section to one from REQUEST, not from config
 		 *
@@ -26,7 +27,6 @@
 			return parent::CheckPermission($event);
 		}
 
-
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
@@ -45,6 +45,10 @@
 			$object->addFilter('module_filter', '%1$s.ModuleOwner = '.$this->Conn->qstr($module));
 			$object->addFilter('section_filter', '%1$s.Section = '.$this->Conn->qstr($section));
 
+			if (!$this->Application->ConfigValue('AllowAdminConsoleInterfaceChange')) {
+				$object->addFilter('interface_change_filter', '%1$s.VariableName <> "AdminConsoleInterface"');
+			}
+
 			if (defined('IS_INSTALL') && IS_INSTALL) {
 				$object->addFilter('install_filter', 'ca.Install = 1');
 			}
@@ -57,8 +61,23 @@
 		 */
 		function OnBeforeItemUpdate(&$event)
 		{
+			static $default_field_options = null;
+
 			$object =& $event->getObject();
+			/* @var $object kDBItem */
 
+			// ability to validate each configuration variable separately
+			if (!isset($default_field_options)) {
+				$default_field_options = $object->GetFieldOptions('VariableValue');
+			}
+
+			$new_field_options = $default_field_options;
+			$validation = $object->GetDBField('Validation');
+			if ($validation) {
+				$new_field_options = array_merge($new_field_options, unserialize($validation));
+			}
+			$object->SetFieldOptions('VariableValue', $new_field_options);
+
 			// if password field is empty, then don't update
 			if ($object->GetDBField('element_type') == 'password') {
 				if (trim($object->GetDBField('VariableValue')) == '') {
@@ -71,20 +90,25 @@
 				}
 			}
 
-			$field_values = $this->Application->GetVar($event->getPrefixSpecial(true));
+			$field_values = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 
-			$state_country_hash = Array(
-											'Comm_State'			=>	'Comm_Country',
-											'Comm_Shipping_State'	=>	'Comm_Shipping_Country'
-									);
+			$state_country_hash = Array (
+				'Comm_State' => 'Comm_Country',
+				'Comm_Shipping_State' => 'Comm_Shipping_Country'
+			);
 
 			$field_name = $object->GetDBField('VariableName');
-			if (isset($state_country_hash[$field_name])) {
+			if (array_key_exists($field_name, $state_country_hash)) {
 				// if this is state field
+				$sql = 'SELECT VariableId
+						FROM ' . $this->Application->getUnitOption('conf', 'TableName') . '
+						WHERE VariableName = "' . $state_country_hash[$field_name] . '"';
+				$country_variable_id = $this->Conn->GetOne($sql);
+
 				$check_state = $object->GetDBField('VariableValue');
-				$check_country = $field_values[ $state_country_hash[$field_name] ]['VariableValue'];
+				$check_country = $field_values[$country_variable_id]['VariableValue'];
 
-				if (!($check_country && $check_state)) {
+				if (!$check_country || !$check_state) {
 					return true;
 				}
 
@@ -93,19 +117,20 @@
 				if ($state_iso !== false) {
 					$object->SetDBField('VariableValue', $state_iso);
 				}
-				else
-				{
-					$errormsgs = $this->Application->GetVar('errormsgs');
-					$errors = !$errormsgs || !isset($errormsgs[$event->Prefix_Special]) ?  Array() : $errormsgs[$event->Prefix_Special];
+				else {
+					// selected state doesn't belong to selected country
+					$object->SetError('VariableValue', 'invalid_state', 'la_InvalidState');
+				}
+			}
 
-					$errors[$field_name] = 'la_InvalidState';
-					$errormsgs[$event->Prefix_Special] = $errors;
+			if ($object->GetDBField('VariableName') == 'AdminConsoleInterface') {
+				$can_change = $this->Application->ConfigValue('AllowAdminConsoleInterfaceChange');
 
-					$this->Application->SetVar('errormsgs', $errormsgs);
-					$event->status = erFAIL;
+				if (($object->GetDBField('VariableValue') != $object->GetOriginalField('VariableValue')) && !$can_change) {
+					$object->SetError('VariableValue', 'not_allowed', 'la_error_NotAllowed');
 				}
-			}
 
+			}
 		}
 
 		/**
@@ -116,13 +141,53 @@
 		function OnAfterItemUpdate(&$event)
 		{
 			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
 			if ($object->GetDBField('element_type') == 'password') {
 				if (trim($object->GetDBField('VariableValue')) == '') {
 					$field_options = $object->GetFieldOptions('VariableValue');
 					unset($field_options['skip_empty']);
 					$object->SetFieldOptions('VariableValue', $field_options);
 				}
 			}
+
+			// allows to check if variable's value was changed now
+			$variable_name = $object->GetDBField('VariableName');
+			$variable_value = $object->GetDBField('VariableValue');
+			$watch_variables = Array (
+				'Require_AdminSSL', 'AdminSSL_URL', 'AdvancedUserManagement',
+				'Site_Name', 'AdminConsoleInterface'
+			);
+
+			if (in_array($variable_name, $watch_variables)) {
+				$changed = $this->Application->GetVar($event->getPrefixSpecial() . '_changed', Array ());
+
+				if ($variable_value != $object->GetOriginalField('VariableValue')) {
+					$changed[] = $variable_name;
+					$this->Application->SetVar($event->getPrefixSpecial() . '_changed', $changed);
+				}
+
+				switch ($variable_name) {
+					case 'Require_AdminSSL':
+					case 'AdminSSL_URL':
+						static $skin_deleted = false;
+
+						if (in_array($variable_name, $changed) && !$skin_deleted) {
+							// when administrative console is moved to SSL mode, then delete skin
+							$skin_helper =& $this->Application->recallObject('SkinHelper');
+							/* @var $skin_helper SkinHelper */
+
+							$skin_file = $skin_helper->getSkinPath();
+							if (file_exists($skin_file)) {
+								unlink($skin_file);
+							}
+
+							$skin_deleted = true;
+						}
+						break;
+				}
+			}
+
 		}
 
 		/**
@@ -133,56 +198,70 @@
 		function OnUpdate(&$event)
 		{
 			if (!$this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+				$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 
 				// 1. save user selected module root category
-				$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 				$new_category_id = getArrayValue($items_info, 'ModuleRootCategory', 'VariableValue');
 				if ($new_category_id !== false) {
 					unset($items_info['ModuleRootCategory']);
-					$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
 				}
 
-				parent::OnUpdate($event);
+				$object =& $event->getObject( Array('skip_autoload' => true) );
+				/* @var $object kDBItem */
 
-				if ($event->status == erSUCCESS && $new_category_id !== false) {
-					// root category was submitted
-					$module = $this->Application->GetVar('module');
-					$root_category_id = $this->Application->findModule('Name', $module, 'RootCat');
+				if ($items_info) {
+					$has_error = false;
+					foreach ($items_info as $id => $field_values) {
+						$object->Clear(); // clear validation errors from previous variable
+						$object->Load($id);
+		 				$object->SetFieldsFromHash($field_values);
 
-					if ($root_category_id != $new_category_id) {
-						// root category differs from one in db
-						$fields_hash = Array('RootCat' => $new_category_id);
-						$this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'Modules', 'Name = '.$this->Conn->qstr($module));
+						if (!$object->Update($id)) {
+							// don't stop when error found !
+							$has_error = true;
+						}
 					}
+
+					$event->status = $has_error ? erFAIL : erSUCCESS;
 				}
 
-				if ($event->status == erSUCCESS) { // reset cache
-					$refresh_sections = false;
-					if ($items_info) {
-						$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-						$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
+				if ($event->status == erSUCCESS) {
+					if ($new_category_id !== false) {
+						// root category was submitted
+						$module = $this->Application->GetVar('module');
+						$root_category_id = $this->Application->findModule('Name', $module, 'RootCat');
 
-						$sql = 'SELECT ' . $id_field . '
-								FROM ' . $table_name . '
-								WHERE ' . $id_field . ' IN (' . implode(',', array_keys($items_info)) . ') AND (VariableName = "AdvancedUserManagement")';
-						$refresh_sections = $this->Conn->GetCol($sql);
+						if ($root_category_id != $new_category_id) {
+							// root category differs from one in db
+							$fields_hash = Array('RootCat' => $new_category_id);
+							$this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'Modules', 'Name = '.$this->Conn->qstr($module));
+						}
 					}
 
-					if ($refresh_sections) {
+					// reset cache
+					$changed = $this->Application->GetVar($event->getPrefixSpecial() . '_changed', Array ());
+					$require_refresh = Array (
+						'AdvancedUserManagement', 'Site_Name', 'AdminConsoleInterface'
+					);
+
+					$refresh_sections = array_intersect($require_refresh, $changed);
+					$require_full_refresh = Array ('Site_Name', 'AdminConsoleInterface');
+
+					if (array_intersect($require_full_refresh, $changed)) {
+						$event->SetRedirectParam('refresh_all', 1);
+					} elseif ($refresh_sections) {
 						// reset sections too, because of AdvancedUserManagement
 						$event->SetRedirectParam('refresh_tree', 1);
 					}
 
 					$this->Application->UnitConfigReader->ResetParsedData($refresh_sections ? true : false);
 				}
+				elseif ($this->Application->GetVar('errors_' . $event->getPrefixSpecial())) {
+					// because we have list out there, and this is item
+					$this->Application->removeObject( $event->getPrefixSpecial() );
+				}
 			}
 
-			if ($this->Application->GetVar('errormsgs')) {
-				// because we have list out there, and this is item
-				$this->Application->removeObject($event->getPrefixSpecial());
-				$event->redirect = false;
-			}
-
 			// keeps module and section in REQUEST to ensure, that last admin template will work
 			$event->SetRedirectParam('module', $this->Application->GetVar('module'));
 			$event->SetRedirectParam('section', $this->Application->GetVar('section'));
@@ -223,8 +302,4 @@
 			$event->SetRedirectParam('opener', 'u');
 		}
 
-	}
-
-
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_currency_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_reviews.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_import_language_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/files/file_tp.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/files/file_tp.php	(.../file_tp.php)	(revision 12127)
+++ branches/5.1.x/core/units/files/file_tp.php	(.../file_tp.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: file_tp.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: file_tp.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class FileTagProcessor extends kDBTagProcessor {
 
 		function DownloadFileLink($params)
@@ -32,6 +34,4 @@
 
 			return $ext ? $ext : $params['default'];
 		}
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_modify.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/utility/cache.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/cache.php	(.../cache.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/cache.php	(.../cache.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cache.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: cache.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class kCache extends kBase {
 
 		/**
@@ -234,7 +236,7 @@
 
 		function FileCacheStorage($filename = '')
 		{
-			$this->_filename = (defined('WRITEABLE') ? WRITEABLE.'/cache' : FULL_PATH.'/kernel/cache') . '/' . $filename;
+			$this->_filename = WRITEABLE . '/cache' . '/' . $filename;
 
 			if (file_exists($this->_filename)) {
 				$cache_data = unserialize(file_get_contents($this->_filename));
@@ -284,6 +286,4 @@
 
 			return $ret;
 		}
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_usergroups.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/js/tree.js
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/js/tree.js	(.../tree.js)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/js/tree.js	(.../tree.js)	(revision 12657)
@@ -84,8 +84,8 @@
 TreeItem.prototype.appendIcon = function (td)
 {
 	img = document.createElement('img');
-	img.style.width = '24px';
-	img.style.height = '22px';
+//	img.style.width = '24px';
+//	img.style.height = '22px';
 	if (this.Icon.indexOf('http://') != -1) {
 		img.src = this.Icon;
 	}
@@ -133,8 +133,11 @@
 				}
 				else {
 					// ensures, that click is made before AJAX request will be sent
-					if (res === true) {
-						// only in case of "true" is returned, used in catalog
+					var $res_type = Object.prototype.toString.call(res);
+
+					if ((res === true) || ($res_type == '[object Object]')) {
+						// in case of "true" is returned, used in catalog
+						// in case of object (tree node) is returned, used in advanced view
 						if (this.treeItem.isContainer()) {
 							this.href = this.treeItem.locateFirstItem().Url;
 						}
@@ -145,7 +148,15 @@
 					if (!this.treeItem.Expanded && this.treeItem.isFolder()) {
 						if (this.treeItem.folderClick());
 					}
-					this.treeItem.highLight();
+
+					if ($res_type == '[object Object]') {
+						// highlight returned tree node instead of clicked one
+						res.highLight(false); // don't expand such node
+					}
+					else {
+						this.treeItem.highLight();
+					}
+
 					return false;
 				}
 			}
@@ -167,7 +178,7 @@
 
 TreeItem.prototype.display = function()
 {
-	this.Tr.style.display = is.ie ? 'block' : 'table-row';
+	this.Tr.style.display = ''; // is.ie ? 'block' : 'table-row';
 	this.Displayed = true;
 
 	var do_sub =  TreeManager.isExpanded(this.Key);
@@ -186,21 +197,29 @@
 	this.Displayed = false;
 }
 
-TreeItem.prototype.highLight = function()
+TreeItem.prototype.highLight = function($auto_expand)
 {
-	if (last_hightlighted) last_hightlighted.Tr.className = '';
+	if ($auto_expand === undefined) {
+		$auto_expand = true;
+	}
+
+	if (last_hightlighted) {
+		last_hightlighted.Tr.className = '';
+	}
+
 	if (this.Children && this.Children.length > 0 && this.isContainer()) {
-		if (!this.Expanded) {
+		if (!this.Expanded && $auto_expand) {
 			this.expand();
 		}
-		this.Children[0].highLight();
+
+		this.Children[0].highLight($auto_expand);
 		return;
 	}
 
 	this.Tr.className = "highlighted";
 	last_hightlighted = this;
 	last_highlighted_key = this.Key;
-	if (!this.Expanded) {
+	if (!this.Expanded && $auto_expand) {
 		this.expand();
 	}
 }
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_settings_search.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/categories/categories_edit_relations.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/categories/categories_edit_relations.tpl	(.../categories_edit_relations.tpl)	(revision 12657)
@@ -35,7 +35,7 @@
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				//Relations related:
-				a_toolbar.AddButton( new ToolBarButton('new_relation', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							openSelector('c-rel', '<inp2:adm_SelectorLink prefix="c-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
 						} ) );
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_advanced_view.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_theme_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/logs/change_logs/change_log_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 12657)
@@ -18,7 +18,7 @@
 								  	std_edit_item('change-log', 'logs/change_logs/change_log_edit');
 								}
 
-								a_toolbar.AddButton( new ToolBarButton('view_item', '<inp2:m_phrase label="la_ToolTip_ViewItem" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_View" escape="1"/>', edit) );
+								a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_ViewDetails" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Details" escape="1"/>', edit) );
 
 
 					  		a_toolbar.AddButton( new ToolBarSeparator('sep1') );
@@ -73,7 +73,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="change-log" IdField="ChangeLogId" grid="Default" grid_filters="1" limited_heights="1" row_class_render_as="row_class"/>
 <script type="text/javascript">
-	Grids['change-log'].SetDependantToolbarButtons( new Array('view_item') );
+	Grids['change-log'].SetDependantToolbarButtons( new Array('edit') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.1.x/core/units/general/cat_dbitem_export.php
===================================================================
diff -u -N
--- branches/5.1.x/core/units/general/cat_dbitem_export.php	(revision 12127)
+++ branches/5.1.x/core/units/general/cat_dbitem_export.php	(revision 0)
@@ -1,1444 +0,0 @@
-<?php
-/**
-* @version	$Id: cat_dbitem_export.php 12006 2009-07-25 10:00:38Z alex $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	define('EXPORT_STEP', 100); // export by 200 items (e.g. links)
-	define('IMPORT_STEP', 20); // export by 200 items (e.g. links)
-	define('IMPORT_CHUNK', 10240); // 10240); //30720); //50120); // 5 KB
-
-	define('IMPORT_TEMP', 1);
-	define('IMPORT_LIVE', 2);
-
-	class kCatDBItemExportHelper extends kHelper {
-
-		var $false = false;
-
-		var $cache = Array();
-
-		/**
-		 * Allows to find out what items are new in cache
-		 *
-		 * @var Array
-		 */
-		var $cacheStatus = Array();
-
-		var $cacheTable = '';
-
-		var $exportFields = Array();
-
-		/**
-		 * Export options
-		 *
-		 * @var Array
-		 */
-		var $exportOptions = Array();
-
-		/**
-		 * Item beeing currenly exported
-		 *
-		 * @var kCatDBItem
-		 */
-		var $curItem = null;
-
-		/**
-		 * Dummy category object
-		 *
-		 * @var CategoriesItem
-		 */
-		var $dummyCategory = null;
-
-		/**
-		 * Pointer to opened file
-		 *
-		 * @var resource
-		 */
-		var $filePointer = null;
-
-		/**
-		 * Custom fields definition of current item
-		 *
-		 * @var Array
-		 */
-		var $customFields = Array();
-
-		function kCatDBItemExportHelper()
-		{
-			parent::kHelper();
-			$this->cacheTable = TABLE_PREFIX.'ImportCache';
-		}
-
-		/**
-		 * Returns value from cache if found or false otherwise
-		 *
-		 * @param string $type
-		 * @param int $key
-		 * @return mixed
-		 */
-		function getFromCache($type, $key)
-		{
-			return getArrayValue($this->cache, $type, $key);
-		}
-
-		/**
-		 * Adds value to be cached
-		 *
-		 * @param string $type
-		 * @param int $key
-		 * @param mixed $value
-		 */
-		function addToCache($type, $key, $value, $is_new = true)
-		{
-//			if (!isset($this->cache[$type])) $this->cache[$type] = Array();
-			$this->cache[$type][$key] = $value;
-			if ($is_new) {
-				$this->cacheStatus[$type][$key] = true;
-			}
-		}
-
-		function storeCache($cache_types)
-		{
-			$cache_types = explode(',', $cache_types);
-
-			$values_sql = '';
-			foreach ($cache_types as $cache_type) {
-				$sql_mask = '('.$this->Conn->qstr($cache_type).',%s,%s),';
-				$cache = getArrayValue($this->cacheStatus, $cache_type);
-				if (!$cache) $cache = Array();
-				foreach ($cache as $var_name => $cache_status) {
-					$var_value = $this->cache[$cache_type][$var_name];
-					$values_sql .= sprintf($sql_mask, $this->Conn->qstr($var_name), $this->Conn->qstr($var_value) );
-				}
-			}
-			$values_sql = preg_replace('/(.*),$/', '\\1', $values_sql);
-			if ($values_sql) {
-				$sql = 'INSERT INTO '.$this->cacheTable.'(`CacheName`,`VarName`,`VarValue`) VALUES '.$values_sql;
-				$this->Conn->Query($sql);
-			}
-
-		}
-
-		function loadCache()
-		{
-			$sql = 'SELECT * FROM '.$this->cacheTable;
-			$records = $this->Conn->Query($sql);
-
-			$this->cache = Array();
-			foreach ($records as $record) {
-				$this->addToCache($record['CacheName'], $record['VarName'], $record['VarValue'], false);
-			}
-		}
-
-		/**
-		 * Fill required fields with dummy values
-		 *
-		 * @param kEvent $event
-		 */
-		function fillRequiredFields(&$event, &$object, $set_status = false)
-		{
-			if ($object == $this->false) {
-				$object =& $event->getObject();
-			}
-
-			$has_empty = false;
-			$fields = array_keys($object->Fields);
-			foreach ($fields as $field_name)
-			{
-				$field_options =& $object->Fields[$field_name];
-				if (isset($object->VirtualFields[$field_name]) || !getArrayValue($field_options, 'required') ) continue;
-				if ( $object->GetDBField($field_name) ) continue;
-
-				$formatter_class = getArrayValue($field_options, 'formatter');
-				if ($formatter_class) // not tested
-				{
-					$formatter =& $this->Application->recallObject($formatter_class);
-					$sample_value = $formatter->GetSample($field_name, $field_options, $object);
-				}
-
-				$has_empty = true;
-				$object->SetField($field_name, isset($sample_value) && $sample_value ? $sample_value : 'no value');
-			}
-			$object->UpdateFormattersSubFields();
-
-			if ($set_status && $has_empty) {
-				$object->SetDBField('Status', 0);
-			}
-		}
-
-		/**
-		 * Verifies that all user entered export params are correct
-		 *
-		 * @param kEvent $event
-		 */
-		function verifyOptions(&$event)
-		{
-			if ($this->Application->RecallVar($event->getPrefixSpecial().'_ForceNotValid'))
-			{
-				$this->Application->StoreVar($event->getPrefixSpecial().'_ForceNotValid', 0);
-				return false;
-			}
-
-			$this->fillRequiredFields($event, $this->false);
-
-			$object =& $event->getObject();
-			$cross_unique_fields = Array('FieldsSeparatedBy', 'FieldsEnclosedBy');
-			if (($object->GetDBField('CategoryFormat') == 1) || ($event->Special == 'import')) // in one field
-			{
-				$object->setRequired('CategorySeparator', true);
-				$cross_unique_fields[] = 'CategorySeparator';
-			}
-
-			$ret = $object->Validate();
-
-			// check if cross unique fields has no same values
-			foreach ($cross_unique_fields as $field_index => $field_name)
-			{
-				if (getArrayValue($object->FieldErrors, $field_name, 'pseudo') == 'required') continue;
-
-				$check_fields = $cross_unique_fields;
-				unset($check_fields[$field_index]);
-
-				foreach ($check_fields as $check_field)
-				{
-					if ($object->GetDBField($field_name) == $object->GetDBField($check_field))
-					{
-						$object->SetError($check_field, 'unique');
-					}
-				}
-			}
-
-			if ($event->Special == 'import')
-			{
-				$this->exportOptions = $this->loadOptions($event);
-
-				$automatic_fields = ($object->GetDBField('FieldTitles') == 1);
-				$object->setRequired('ExportColumns', !$automatic_fields);
-				$category_prefix = '__CATEGORY__';
-				if ( $automatic_fields && ($this->exportOptions['SkipFirstRow']) ) {
-					$this->openFile($event);
-					$this->exportOptions['ExportColumns'] = $this->readRecord();
-
-					if (!$this->exportOptions['ExportColumns']) {
-						$this->exportOptions['ExportColumns'] = Array ();
-					}
-
-					$this->closeFile();
-
-					// remove additional (non-parseble columns)
-					foreach ($this->exportOptions['ExportColumns'] as $field_index => $field_name) {
-						if (!$this->validateField($field_name, $object)) {
-							unset($this->exportOptions['ExportColumns'][$field_index]);
-						}
-					}
-					$category_prefix = '';
-				}
-
-				// 1. check, that we have column definitions
-				if (!$this->exportOptions['ExportColumns']) {
-					$object->setError('ExportColumns', 'required');
-					$ret = false;
-				}
-				else {
-					// 1.1. check that all required fields are present in imported file
-					$missing_columns = Array();
-					foreach ($object->Fields as $field_name => $field_options) {
-						if ($object->skipField($field_name)) continue;
-						if (getArrayValue($field_options, 'required') && !in_array($field_name, $this->exportOptions['ExportColumns']) ) {
-							$missing_columns[] = $field_name;
-							$object->setError('ExportColumns', 'required_fields_missing', 'la_error_RequiredColumnsMissing');
-							$ret = false;
-						}
-					}
-
-					if (!$ret && $this->Application->isDebugMode()) {
-						$this->Application->Debugger->appendHTML('Missing required for import/export:');
-						$this->Application->Debugger->dumpVars($missing_columns);
-					}
-				}
-
-
-				// 2. check, that we have only mixed category field or only separated category fields
-				$category_found['mixed'] = false;
-				$category_found['separated'] = false;
-
-				foreach ($this->exportOptions['ExportColumns'] as $import_field) {
-					if (preg_match('/^'.$category_prefix.'Category(Path|[0-9]+)/', $import_field, $rets)) {
-						$category_found[$rets[1] == 'Path' ? 'mixed' : 'separated'] = true;
-					}
-				}
-				if ($category_found['mixed'] && $category_found['separated']) {
-					$object->SetError('ExportColumns', 'unique_category', 'la_error_unique_category_field');
-					$ret = false;
-				}
-
-				// 3. check, that duplicates check fields are selected & present in imported fields
-				if ($this->exportOptions['ReplaceDuplicates']) {
-					if ($this->exportOptions['CheckDuplicatesMethod'] == 1) {
-						$check_fields = Array($object->IDField);
-					}
-					else {
-						$check_fields = $this->exportOptions['DuplicateCheckFields'] ? explode('|', substr($this->exportOptions['DuplicateCheckFields'], 1, -1)) : Array();
-						$object =& $event->getObject();
-
-						$language_id = $this->Application->GetDefaultLanguageId();
-						foreach ($check_fields as $index => $check_field) {
-							foreach ($object->Fields as $field_name => $field_options) {
-								if ($field_name == 'l'.$language_id.'_'.$check_field) {
-									$check_fields[$index] = 'l'.$language_id.'_'.$check_field;
-									break;
-								}
-							}
-						}
-					}
-					$this->exportOptions['DuplicateCheckFields'] = $check_fields;
-
-					if (!$check_fields) {
-						$object->setError('CheckDuplicatesMethod', 'required');
-						$ret = false;
-					}
-					else {
-						foreach ($check_fields as $check_field) {
-							$check_field = preg_replace('/^cust_(.*)/', 'Custom_\\1', $check_field);
-							if (!in_array($check_field, $this->exportOptions['ExportColumns'])) {
-								$object->setError('ExportColumns', 'required');
-								$ret = false;
-								break;
-							}
-						}
-					}
-				}
-				$this->saveOptions($event);
-			}
-
-			return $ret;
-		}
-
-		/**
-		 * Returns filename to read import data from
-		 *
-		 * @return string
-		 */
-		function getImportFilename()
-		{
-			if ($this->exportOptions['ImportSource'] == 1)
-			{
-				$ret = $this->exportOptions['ImportFilename']; // ['name']; commented by Kostja
-			}
-			else {
-				$ret = $this->exportOptions['ImportLocalFilename'];
-			}
-			return EXPORT_PATH.'/'.$ret;
-		}
-
-		/**
-		 * Returns filename to write export data to
-		 *
-		 * @return string
-		 */
-		function getExportFilename()
-		{
-			return EXPORT_PATH.'/'.$this->exportOptions['ExportFilename'].'.'.$this->getFileExtension();
-		}
-
-		/**
-		 * Opens file required for export/import operations
-		 *
-		 * @param kEvent $event
-		 */
-		function openFile(&$event)
-		{
-			if ($event->Special == 'export') {
-				$write_mode = ($this->exportOptions['start_from'] == 0) ? 'w' : 'a';
-				$this->filePointer = fopen($this->getExportFilename(), $write_mode);
-			}
-			else {
-				$this->filePointer = fopen($this->getImportFilename(), 'r');
-			}
-
-			// skip UTF-8 BOM Modifier
-			$first_chars = fread($this->filePointer, 3);
-			if (bin2hex($first_chars) != 'efbbbf') {
-				fseek($this->filePointer, 0);
-			}
-		}
-
-		/**
-		 * Closes opened file
-		 *
-		 */
-		function closeFile()
-		{
-			fclose($this->filePointer);
-		}
-
-		function getCustomSQL()
-		{
-			$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
-
-			$custom_sql = '';
-			foreach ($this->customFields as $custom_id => $custom_name) {
-				$custom_sql .= 'custom_data.'.$ml_formatter->LangFieldName('cust_'.$custom_id).' AS cust_'.$custom_name.', ';
-			}
-
-			return preg_replace('/(.*), /', '\\1', $custom_sql);
-		}
-
-		function getPlainExportSQL($count_only = false) {
-			if ($count_only && isset($this->exportOptions['ForceCountSQL'])) {
-				$sql = $this->exportOptions['ForceCountSQL'];
-			}
-			elseif (!$count_only && isset($this->exportOptions['ForceSelectSQL'])) {
-				$sql = $this->exportOptions['ForceSelectSQL'];
-			}
-			else {
-				$items_list =& $this->Application->recallObject($this->curItem->Prefix.'.export-items-list', $this->curItem->Prefix.'_List');
-				$items_list->SetPerPage(-1);
-
-				if ($options['export_ids'] != '') {
-					$items_list->AddFilter('export_ids', $items_list->TableName.'.'.$items_list->IDField.' IN ('.implode(',',$options['export_ids']).')');
-				}
-
-				if ($count_only) {
-					$sql = $items_list->getCountSQL( $items_list->GetSelectSQL(true,false) );
-				}
-				else {
-					$sql = $items_list->GetSelectSQL();
-				}
-			}
-
-			if (!$count_only)
-			{
-				$sql .= ' LIMIT '.$this->exportOptions['start_from'].','.EXPORT_STEP;
-			}
-//			else {
-//				$sql = preg_replace("/^.*SELECT(.*?)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql);
-//			}
-
-			return $sql;
-		}
-
-		function getExportSQL($count_only = false)
-		{
-			if (!$this->Application->getUnitOption($this->curItem->Prefix, 'CatalogItem')) {
-				return $this->GetPlainExportSQL($count_only); // in case this is not a CategoryItem
-			}
-
-			if ($this->exportOptions['export_ids'] === false)
-			{
-				// get links from current category & all it's subcategories
-				$join_clauses = Array();
-
-				$custom_sql = $this->getCustomSQL();
-				if ($custom_sql) {
-					$custom_table = $this->Application->getUnitOption($this->curItem->Prefix.'-cdata', 'TableName');
-					$join_clauses[$custom_table.' custom_data'] = 'custom_data.ResourceId = item_table.ResourceId';
-				}
-
-				$join_clauses[TABLE_PREFIX.'CategoryItems ci'] = 'ci.ItemResourceId = item_table.ResourceId';
-				$join_clauses[TABLE_PREFIX.'Category c'] = 'c.CategoryId = ci.CategoryId';
-
-				$sql = 'SELECT item_table.*, ci.CategoryId'.($custom_sql ? ', '.$custom_sql : '').'
-						FROM '.$this->curItem->TableName.' item_table';
-
-				foreach ($join_clauses as $table_name => $join_expression) {
-					$sql .= ' LEFT JOIN '.$table_name.' ON '.$join_expression;
-				}
-				$sql .= ' WHERE ';
-
-				if ($this->exportOptions['export_cats_ids'][0] == 0)
-				{
-					$sql .= '1';
-				}
-				else {
-					foreach ($this->exportOptions['export_cats_ids'] as $category_id) {
-						$sql .= '(c.ParentPath LIKE "%|'.$category_id.'|%") OR ';
-					}
-					$sql = preg_replace('/(.*) OR $/', '\\1', $sql);
-				}
-
-				$sql .= ' ORDER BY ci.PrimaryCat DESC'; // NEW
-			}
-			else {
-				// get only selected links
-				$sql = 'SELECT item_table.*, '.$this->exportOptions['export_cats_ids'][0].' AS CategoryId
-						FROM '.$this->curItem->TableName.' item_table
-						WHERE '.$this->curItem->IDField.' IN ('.implode(',', $this->exportOptions['export_ids']).')';
-			}
-
-			if (!$count_only)
-			{
-				$sql .= ' LIMIT '.$this->exportOptions['start_from'].','.EXPORT_STEP;
-			}
-			else {
-				$sql = preg_replace("/^.*SELECT(.*?)FROM(?!_)/is", "SELECT COUNT(*) AS count FROM ", $sql);
-			}
-
-			return $sql;
-		}
-
-		/**
-		 * Enter description here...
-		 *
-		 * @param kEvent $event
-		 */
-		function performExport(&$event)
-		{
-			$this->exportOptions = $this->loadOptions($event);
-			$this->exportFields = $this->exportOptions['ExportColumns'];
-			$this->curItem =& $event->getObject( Array('skip_autoload' => true) );
-			$this->customFields = $this->Application->getUnitOption($event->Prefix, 'CustomFields');
-			$this->openFile($event);
-
-			if ($this->exportOptions['start_from'] == 0) // first export step
-			{
-				if (!getArrayValue($this->exportOptions, 'IsBaseCategory')) {
-					$this->exportOptions['IsBaseCategory'] = 0;
-				}
-
-				if ($this->exportOptions['IsBaseCategory'] ) {
-					$sql = 'SELECT ParentPath
-							FROM '.TABLE_PREFIX.'Category
-							WHERE CategoryId = '.$this->Application->GetVar('m_cat_id');
-					$parent_path = $this->Conn->GetOne($sql);
-					$parent_path = explode('|', substr($parent_path, 1, -1));
-					if ($parent_path && $parent_path[0] == $this->Application->findModule('Name', 'Core', 'RootCat')) {
-						array_shift($parent_path);
-					}
-
-					$this->exportOptions['BaseLevel'] = count($parent_path); // level to cut from other categories
-				}
-
-				// 1. export field titles if required
-				if ($this->exportOptions['IncludeFieldTitles'])
-				{
-					$data_array = Array();
-					foreach ($this->exportFields as $export_field)
-					{
-						$data_array = array_merge($data_array, $this->getFieldCaption($export_field));
-					}
-					$this->writeRecord($data_array);
-				}
-				$this->exportOptions['total_records'] = $this->Conn->GetOne( $this->getExportSQL(true) );
-			}
-
-			// 2. export data
-			$records = $this->Conn->Query( $this->getExportSQL() );
-			$records_exported = 0;
-			foreach ($records as $record_info) {
-				$this->curItem->Clear();
-				$this->curItem->SetDBFieldsFromHash($record_info);
-				$this->setCurrentID();
-				$this->curItem->raiseEvent('OnAfterItemLoad', $this->curItem->GetID() );
-
-				$data_array = Array();
-				foreach ($this->exportFields as $export_field)
-				{
-					$data_array = array_merge($data_array, $this->getFieldValue($export_field) );
-				}
-				$this->writeRecord($data_array);
-				$records_exported++;
-			}
-			$this->closeFile();
-
-			$this->exportOptions['start_from'] += $records_exported;
-			$this->saveOptions($event);
-
-			return $this->exportOptions;
-		}
-
-		function getItemFields()
-		{
-			// just in case dummy user selected automtic mode & moved columns too :(
-			return array_merge($this->curItem->Fields['AvailableColumns']['options'], $this->curItem->Fields['ExportColumns']['options']);
-		}
-
-		/**
-		 * Checks if field really belongs to importable field list
-		 *
-		 * @param string $field_name
-		 * @param kCatDBItem $object
-		 * @return bool
-		 */
-		function validateField($field_name, &$object)
-		{
-			// 1. convert custom field
-			$field_name = preg_replace('/^Custom_(.*)/', '__CUSTOM__\\1', $field_name);
-
-			// 2. convert category field (mixed version & serparated version)
-			$field_name = preg_replace('/^Category(Path|[0-9]+)/', '__CATEGORY__Category\\1', $field_name);
-
-			$valid_fields = $object->getPossibleExportColumns();
-			return isset($valid_fields[$field_name]) || isset($valid_fields['__VIRTUAL__'.$field_name]);
-		}
-
-		/**
-		 * Enter description here...
-		 *
-		 * @param kEvent $event
-		 */
-		function performImport(&$event)
-		{
-			if (!$this->exportOptions) {
-				// load import options in case if not previously loaded in verification function
-				$this->exportOptions = $this->loadOptions($event);
-			}
-
-			$backup_category_id = $this->Application->GetVar('m_cat_id');
-			$this->Application->SetVar('m_cat_id', (int)$this->Application->RecallVar('ImportCategory') );
-
-			$this->openFile($event);
-
-			$bytes_imported = 0;
-			if ($this->exportOptions['start_from'] == 0) // first export step
-			{
-				// 1st time run
-				if ($this->exportOptions['SkipFirstRow']) {
-					$this->readRecord();
-					$this->exportOptions['start_from'] = ftell($this->filePointer);
-					$bytes_imported = ftell($this->filePointer);
-				}
-
-				$current_category_id = $this->Application->GetVar('m_cat_id');
-				if ($current_category_id > 0) {
-					$sql = 'SELECT ParentPath FROM '.TABLE_PREFIX.'Category WHERE CategoryId = '.$current_category_id;
-					$this->exportOptions['ImportCategoryPath'] = $this->Conn->GetOne($sql);
-				}
-				else {
-					$this->exportOptions['ImportCategoryPath'] = '';
-				}
-				$this->exportOptions['total_records'] = filesize($this->getImportFilename());
-			}
-			else {
-				$this->loadCache();
-			}
-
-			$this->exportFields = $this->exportOptions['ExportColumns'];
-			$this->addToCache('category_parent_path', $this->Application->GetVar('m_cat_id'), $this->exportOptions['ImportCategoryPath']);
-
-			// 2. import data
-			$this->dummyCategory =& $this->Application->recallObject('c.-tmpitem', 'c', Array('skip_autoload' => true));
-			fseek($this->filePointer, $this->exportOptions['start_from']);
-
-			$items_processed = 0;
-			while (($bytes_imported < IMPORT_CHUNK && $items_processed < IMPORT_STEP) && !feof($this->filePointer)) {
-				$data = $this->readRecord();
-				if ($data) {
-					if ($this->exportOptions['ReplaceDuplicates']) {
-						// set fields used as keys for replace duplicates code
-						$this->resetImportObject($event, IMPORT_TEMP, $data);
-					}
-
-					$this->processCurrentItem($event, $data);
-				}
-				$bytes_imported = ftell($this->filePointer) - $this->exportOptions['start_from'];
-				$items_processed++;
-			}
-
-			$this->closeFile();
-			$this->Application->SetVar('m_cat_id', $backup_category_id);
-
-			$this->exportOptions['start_from'] += $bytes_imported;
-			$this->storeCache('new_ids');
-
-			$this->saveOptions($event);
-
-			if ($this->exportOptions['start_from'] == $this->exportOptions['total_records']) {
-				$this->Conn->Query('TRUNCATE TABLE '.$this->cacheTable);
-			}
-
-			return $this->exportOptions;
-		}
-
-		function setCurrentID()
-		{
-			$this->curItem->setID( $this->curItem->GetDBField($this->curItem->IDField) );
-		}
-
-		function setFieldValue($field_index, $value)
-		{
-			if (empty($value)) {
-				$value = null;
-			}
-
-			$field_name = getArrayValue($this->exportFields, $field_index);
-			if ($field_name == 'ResourceId') {
-				return false;
-			}
-
-			if (substr($field_name, 0, 7) == 'Custom_') {
-				$field_name = 'cust_'.substr($field_name, 7);
-				$this->curItem->SetField($field_name, $value);
-			}
-			elseif ($field_name == 'CategoryPath' || $field_name == '__CATEGORY__CategoryPath') {
-				$this->curItem->CategoryPath = $value ? explode($this->exportOptions['CategorySeparator'], $value) : Array();
-			}
-			elseif (substr($field_name, 0, 8) == 'Category') {
-				$this->curItem->CategoryPath[ (int)substr($field_name, 8) - 1 ] = $value;
-			}
-			elseif (substr($field_name, 0, 20) == '__CATEGORY__Category') {
-				$this->curItem->CategoryPath[ (int)substr($field_name, 20) ] = $value;
-			}
-			elseif (substr($field_name, 0, 11) == '__VIRTUAL__') {
-				$field_name = substr($field_name, 11);
-				$this->curItem->SetField($field_name, $value);
-			}
-			else {
-				$this->curItem->SetField($field_name, $value);
-			}
-
-			$pseudo_error = getArrayValue($this->curItem->FieldErrors, $field_name, 'pseudo');
-			if ($pseudo_error) {
-				$this->curItem->SetDBField($field_name, null);
-				unset($this->curItem->FieldErrors[$field_name]);
-			}
-		}
-
-		function resetImportObject(&$event, $object_type, $record_data = null)
-		{
-			switch ($object_type) {
-				case IMPORT_TEMP:
-					$this->curItem =& $event->getObject( Array('skip_autoload' => true) );
-					break;
-
-				case IMPORT_LIVE:
-					$this->curItem =& $this->Application->recallObject($event->Prefix.'.-tmpitem'.$event->Special, $event->Prefix, Array('skip_autoload' => true));
-					break;
-			}
-			$this->curItem->Clear();
-			$this->customFields = $this->Application->getUnitOption($event->Prefix, 'CustomFields');
-
-			if (isset($record_data)) {
-				$this->setImportData($record_data);
-			}
-		}
-
-		function setImportData($record_data)
-		{
-			foreach ($record_data as $field_index => $field_value) {
-				$this->setFieldValue($field_index, $field_value);
-			}
-			$this->setCurrentID();
-		}
-
-
-		function getItemCategory()
-		{
-			static $lang_prefix = null;
-			$backup_category_id = $this->Application->GetVar('m_cat_id');
-
-			$category_id = $this->getFromCache('category_names', implode(':', $this->curItem->CategoryPath));
-			if ($category_id) {
-				$this->Application->SetVar('m_cat_id', $category_id);
-				return $category_id;
-			}
-
-			if (is_null($lang_prefix)) {
-				$lang_prefix = 'l'.$this->Application->GetVar('m_lang').'_';
-			}
-
-			foreach ($this->curItem->CategoryPath as $category_index => $category_name) {
-				if (!$category_name) continue;
-				$category_key = crc32( implode(':', array_slice($this->curItem->CategoryPath, 0, $category_index + 1) ) );
-
-				$category_id = $this->getFromCache('category_names', $category_key);
-				if ($category_id === false) {
-					// get parent category path to search only in it
-					$current_category_id = $this->Application->GetVar('m_cat_id');
-//					$parent_path = $this->getParentPath($current_category_id);
-
-					// get category id from database by name
-					$sql = 'SELECT CategoryId
-							FROM '.TABLE_PREFIX.'Category
-							WHERE ('.$lang_prefix.'Name = '.$this->Conn->qstr($category_name).') AND (ParentId = '.$current_category_id.')';
-					$category_id = $this->Conn->GetOne($sql);
-
-					if ($category_id === false) {
-						// category not in db -> create
-						$category_fields = Array(	$lang_prefix.'Name' => $category_name, $lang_prefix.'Description' => $category_name,
-													'Status' => STATUS_ACTIVE, 'ParentId' => $current_category_id, 'AutomaticFilename' => 1
-											);
-						$this->dummyCategory->SetDBFieldsFromHash($category_fields);
-						if ($this->dummyCategory->Create()) {
-							$category_id = $this->dummyCategory->GetID();
-							$this->addToCache('category_parent_path', $category_id, $this->dummyCategory->GetDBField('ParentPath'));
-							$this->addToCache('category_names', $category_key, $category_id);
-						}
-					}
-					else {
-						$this->addToCache('category_names', $category_key, $category_id);
-					}
-				}
-
-				if ($category_id) {
-					$this->Application->SetVar('m_cat_id', $category_id);
-				}
-			}
-			if (!$this->curItem->CategoryPath) {
-				$category_id = $backup_category_id;
-			}
-
-			return $category_id;
-		}
-
-		/**
-		 * Enter description here...
-		 *
-		 * @param kEvent $event
-		 */
-		function processCurrentItem(&$event, $record_data)
-		{
-			$save_method = 'Create';
-			$load_keys = Array();
-
-			// create/update categories
-			$backup_category_id = $this->Application->GetVar('m_cat_id');
-
-			// perform replace duplicates code
-			if ($this->exportOptions['ReplaceDuplicates']) {
-				// get replace keys first, then reset current item to empty one
-				$category_id = $this->getItemCategory();
-				if ($this->exportOptions['CheckDuplicatesMethod'] == 1) {
-					if ($this->curItem->GetID()) {
-						$load_keys = Array($this->curItem->IDField => $this->curItem->GetID());
-					}
-				}
-				else {
-					$key_fields = $this->exportOptions['DuplicateCheckFields'];
-					foreach ($key_fields as $key_field) {
-						$load_keys[$key_field] = $this->curItem->GetDBField($key_field);
-					}
-				}
-
-				$this->resetImportObject($event, IMPORT_LIVE);
-
-				if (count($load_keys)) {
-					$where_clause = '';
-					foreach ($load_keys as $field_name => $field_value) {
-						if (preg_match('/^cust_(.*)/', $field_name, $regs)) {
-							$custom_id = array_search($regs[1], $this->customFields);
-							$field_name = 'l'.$this->Application->GetVar('m_lang').'_cust_'.$custom_id;
-							$where_clause .= '(custom_data.`'.$field_name.'` = '.$this->Conn->qstr($field_value).') AND ';
-						}
-						else {
-							$where_clause .= '(item_table.`'.$field_name.'` = '.$this->Conn->qstr($field_value).') AND ';
-						}
-
-					}
-					$where_clause = preg_replace('/(.*) AND $/', '\\1', $where_clause);
-
-					$item_id = $this->getFromCache('new_ids', crc32($where_clause));
-					if (!$item_id) {
-						if ($this->exportOptions['CheckDuplicatesMethod'] == 2) {
-							// by other fields
-							$parent_path = $this->getParentPath($category_id);
-							$where_clause = '(c.ParentPath LIKE "'.$parent_path.'%") AND '.$where_clause;
-						}
-
-						$cdata_table = $this->Application->getUnitOption($event->Prefix.'-cdata', 'TableName');
-						$sql = 'SELECT '.$this->curItem->IDField.'
-								FROM '.$this->curItem->TableName.' item_table
-								LEFT JOIN '.$cdata_table.' custom_data ON custom_data.ResourceId = item_table.ResourceId
-								LEFT JOIN '.TABLE_PREFIX.'CategoryItems ci ON ci.ItemResourceId = item_table.ResourceId
-								LEFT JOIN '.TABLE_PREFIX.'Category c ON c.CategoryId = ci.CategoryId
-								WHERE '.$where_clause;
-						$item_id = $this->Conn->GetOne($sql);
-					}
-					$save_method = $item_id && $this->curItem->Load($item_id) ? 'Update' : 'Create';
-					if ($save_method == 'Update') {
-						// replace id from csv file with found id (only when ID is found in cvs file)
-						if (in_array($this->curItem->IDField, $this->exportFields)) {
-							$record_data[ array_search($this->curItem->IDField, $this->exportFields) ] = $item_id;
-						}
-					}
-				}
-
-				$this->setImportData($record_data);
-			}
-			else {
-				$this->resetImportObject($event, IMPORT_LIVE, $record_data);
-				$category_id = $this->getItemCategory();
-			}
-
-			// create main record
-			if ($save_method == 'Create') {
-				$this->fillRequiredFields($this->false, $this->curItem, true);
-			}
-
-//			$sql_start = getmicrotime();
-			if (!$this->curItem->$save_method()) {
-				$this->Application->SetVar('m_cat_id', $backup_category_id);
-				return false;
-			}
-//			$sql_end = getmicrotime();
-//			$this->saveLog('SQL ['.$save_method.'] Time: '.($sql_end - $sql_start).'s');
-
-			if ($load_keys && ($save_method == 'Create') && $this->exportOptions['ReplaceDuplicates']) {
-				// map new id to old id
-				$this->addToCache('new_ids', crc32($where_clause), $this->curItem->GetID() );
-			}
-
-			// assign item to categories
-			$this->curItem->assignToCategory($category_id, false);
-
-			$this->Application->SetVar('m_cat_id', $backup_category_id);
-			return true;
-		}
-
-		/*function saveLog($msg)
-		{
-			static $first_time = true;
-
-			$fp = fopen(FULL_PATH.'/sqls.log', $first_time ? 'w' : 'a');
-			fwrite($fp, $msg."\n");
-			fclose($fp);
-
-			$first_time = false;
-		}*/
-
-		/**
-		 * Returns category parent path, if possible, then from cache
-		 *
-		 * @param int $category_id
-		 * @return string
-		 */
-		function getParentPath($category_id)
-		{
-			$parent_path = $this->getFromCache('category_parent_path', $category_id);
-			if ($parent_path === false) {
-				$sql = 'SELECT ParentPath
-						FROM '.TABLE_PREFIX.'Category
-						WHERE CategoryId = '.$category_id;
-				$parent_path = $this->Conn->GetOne($sql);
-				$this->addToCache('category_parent_path', $category_id, $parent_path);
-			}
-			return $parent_path;
-		}
-
-		function getFileExtension()
-		{
-			return $this->exportOptions['ExportFormat'] == 1 ? 'csv' : 'xml';
-		}
-
-		function getLineSeparator($option = 'LineEndings')
-		{
-			return $this->exportOptions[$option] == 1 ? "\r\n" : "\n";
-		}
-
-		/**
-		 * Returns field caption for any exported field
-		 *
-		 * @param string $field
-		 * @return string
-		 */
-		function getFieldCaption($field)
-		{
-			if (substr($field, 0, 10) == '__CUSTOM__')
-			{
-				$ret = 'Custom_'.substr($field, 10, strlen($field) );
-			}
-			elseif (substr($field, 0, 12) == '__CATEGORY__')
-			{
-				return $this->getCategoryTitle();
-			}
-			elseif (substr($field, 0, 11) == '__VIRTUAL__') {
-				$ret = substr($field, 11);
-			}
-			else
-			{
-				$ret = $field;
-			}
-
-			return Array($ret);
-		}
-
-		/**
-		 * Returns requested field value (including custom fields and category fields)
-		 *
-		 * @param string $field
-		 * @return string
-		 */
-		function getFieldValue($field)
-		{
-			if (substr($field, 0, 10) == '__CUSTOM__') {
-				$field = 'cust_'.substr($field, 10, strlen($field));
-				$ret = $this->curItem->GetField($field);
-			}
-			elseif (substr($field, 0, 12) == '__CATEGORY__') {
-				return $this->getCategoryPath();
-			}
-			elseif (substr($field, 0, 11) == '__VIRTUAL__') {
-				$field = substr($field, 11);
-				$ret = $this->curItem->GetField($field);
-			}
-			else
-			{
-				$ret = $this->curItem->GetField($field);
-			}
-
-			$ret = str_replace("\r\n", $this->getLineSeparator('LineEndingsInside'), $ret);
-			return Array($ret);
-		}
-
-		/**
-		 * Returns category field(-s) caption based on export mode
-		 *
-		 * @return string
-		 */
-		function getCategoryTitle()
-		{
-			// category path in separated fields
-			$category_count = $this->getMaxCategoryLevel();
-			if ($this->exportOptions['CategoryFormat'] == 1)
-			{
-				// category path in one field
-				return $category_count ? Array('CategoryPath') : Array();
-			}
-			else
-			{
-				$i = 0;
-				$ret = Array();
-				while ($i < $category_count) {
-					$ret[] = 'Category'.($i + 1);
-					$i++;
-				}
-				return $ret;
-			}
-		}
-
-		/**
-		 * Returns category path in required format for current link
-		 *
-		 * @return string
-		 */
-		function getCategoryPath()
-		{
-			$category_id = $this->curItem->GetDBField('CategoryId');
-			$category_path = $this->getFromCache('category_path', $category_id);
-			if (!$category_path)
-			{
-				$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
-				$sql = 'SELECT '.$ml_formatter->LangFieldName('CachedNavbar').'
-						FROM '.TABLE_PREFIX.'Category
-						WHERE CategoryId = '.$category_id;
-				$category_path = $this->Conn->GetOne($sql);
-
-				$category_path = $category_path ? explode('&|&', $category_path) : Array();
-				if ($category_path && strtolower($category_path[0]) == 'content') {
-					array_shift($category_path);
-				}
-
-				if ($this->exportOptions['IsBaseCategory']) {
-					$i = $this->exportOptions['BaseLevel'];
-					while ($i > 0) {
-						array_shift($category_path);
-						$i--;
-					}
-				}
-
-				$category_count = $this->getMaxCategoryLevel();
-				if ($this->exportOptions['CategoryFormat'] == 1) {
-					// category path in single field
-					$category_path = $category_count ? Array( implode($this->exportOptions['CategorySeparator'], $category_path) ) : Array();
-				}
-				else {
-					// category path in separated fields
-					$levels_used = count($category_path);
-					if ($levels_used < $category_count)
-					{
-						$i = 0;
-						while ($i < $category_count - $levels_used) {
-							$category_path[] = '';
-							$i++;
-						}
-					}
-				}
-				$this->addToCache('category_path', $category_id, $category_path);
-			}
-
-			return $category_path;
-		}
-
-		/**
-		 * Get maximal category deep level from links beeing exported
-		 *
-		 * @return int
-		 */
-		function getMaxCategoryLevel()
-		{
-			static $max_level = -1;
-
-			if ($max_level != -1)
-			{
-				return $max_level;
-			}
-
-			$sql = 'SELECT IF(c.CategoryId IS NULL, 0, MAX( LENGTH(c.ParentPath) - LENGTH( REPLACE(c.ParentPath, "|", "") ) - 1 ))
-					FROM '.$this->curItem->TableName.' item_table
-					LEFT JOIN '.TABLE_PREFIX.'CategoryItems ci ON item_table.ResourceId = ci.ItemResourceId
-					LEFT JOIN '.TABLE_PREFIX.'Category c ON c.CategoryId = ci.CategoryId
-					WHERE (ci.PrimaryCat = 1) AND ';
-
-			$where_clause = '';
-			if ($this->exportOptions['export_ids'] === false) {
-				// get links from current category & all it's subcategories
-				if ($this->exportOptions['export_cats_ids'][0] == 0) {
-					$where_clause = 1;
-				}
-				else {
-					foreach ($this->exportOptions['export_cats_ids'] as $category_id) {
-						$where_clause .= '(c.ParentPath LIKE "%|'.$category_id.'|%") OR ';
-					}
-					$where_clause = preg_replace('/(.*) OR $/', '\\1', $where_clause);
-				}
-			}
-			else {
-				// get only selected links
-				$where_clause = $this->curItem->IDField.' IN ('.implode(',', $this->exportOptions['export_ids']).')';
-			}
-
-			$max_level = $this->Conn->GetOne($sql.'('.$where_clause.')');
-
-			if ($this->exportOptions['IsBaseCategory'] ) {
-				$max_level -= $this->exportOptions['BaseLevel'];
-			}
-
-			return $max_level;
-		}
-
-		/**
-		 * Saves one record to export file
-		 *
-		 * @param Array $fields_hash
-		 */
-		function writeRecord($fields_hash)
-		{
-			fputcsv2($this->filePointer, $fields_hash, $this->exportOptions['FieldsSeparatedBy'], $this->exportOptions['FieldsEnclosedBy'], $this->getLineSeparator() );
-		}
-
-		function readRecord()
-		{
-			return fgetcsv($this->filePointer, 10000, $this->exportOptions['FieldsSeparatedBy'], $this->exportOptions['FieldsEnclosedBy']);
-		}
-
-		function saveOptions(&$event, $options = null)
-		{
-			if (!isset($options)) {
-				$options = $this->exportOptions;
-			}
-			$this->Application->StoreVar($event->getPrefixSpecial().'_options', serialize($options) );
-		}
-
-		function loadOptions(&$event)
-		{
-			return unserialize($this->Application->RecallVar($event->getPrefixSpecial().'_options'));
-		}
-
-		/**
-		 * Sets correct available & export fields
-		 *
-		 * @param kEvent $event
-		 */
-		function prepareExportColumns(&$event)
-		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
-
-			if (!array_key_exists('ExportColumns', $object->Fields)) {
-				// import/export prefix was used (see kDBEventHandler::prepareObject) but object don't plan to be imported/exported
-				return ;
-			}
-
-			$available_columns = Array();
-
-			if ($this->Application->getUnitOption($event->Prefix, 'CatalogItem')) {
-				// category field (mixed)
-				$available_columns['__CATEGORY__CategoryPath'] = 'CategoryPath';
-
-				if ($event->Special == 'import') {
-					// category field (separated fields)
-					$max_level = $this->Application->ConfigValue('MaxImportCategoryLevels');
-					$i = 0;
-					while ($i < $max_level) {
-						$available_columns['__CATEGORY__Category'.($i + 1)] = 'Category'.($i + 1);
-						$i++;
-					}
-				}
-			}
-
-			// db fields
-			foreach ($object->Fields as $field_name => $field_options)
-			{
-				if (!$object->skipField($field_name))
-				{
-					$available_columns[$field_name] = $field_name.(getArrayValue($field_options, 'required') ? '*' : '');
-				}
-			}
-
-			$handler =& $this->Application->recallObject($event->Prefix.'_EventHandler');
-			$available_columns = array_merge_recursive2($available_columns, $handler->getCustomExportColumns($event));
-
-			// custom fields
-			foreach ($object->customFields as $custom_id => $custom_name)
-			{
-				$available_columns['__CUSTOM__'.$custom_name] = $custom_name;
-			}
-
-			// columns already in use
-			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-			if ($items_info)
-			{
-				list($item_id, $field_values) = each($items_info);
-				$export_keys = $field_values['ExportColumns'];
-				$export_keys = $export_keys ? explode('|', substr($export_keys, 1, -1) ) : Array();
-			}
-			else {
-				$export_keys = Array();
-			}
-
-			$export_columns = Array();
-			foreach ($export_keys as $field_key)
-			{
-				$field_name = $this->getExportField($field_key);
-				$export_columns[$field_key] = $field_name;
-				unset($available_columns[$field_key]);
-			}
-
-			$options = $object->GetFieldOptions('ExportColumns');
-			$options['options'] = $export_columns;
-			$object->SetFieldOptions('ExportColumns', $options);
-
-			$options = $object->GetFieldOptions('AvailableColumns');
-			$options['options'] = $available_columns;
-			$object->SetFieldOptions('AvailableColumns', $options);
-
-			$this->updateImportFiles($event);
-			$this->PrepareExportPresets($event);
-		}
-
-		function PrepareExportPresets(&$event)
-		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
-			$options = $object->GetFieldOptions('ExportPresets');
-
-			$export_settings = $this->Application->RecallPersistentVar('export_settings');
-			if (!$export_settings) return ;
-			$export_settings = unserialize($export_settings);
-
-			if (!isset($export_settings[$event->Prefix])) return ;
-
-
-			$export_presets = array(''=>'');
-			foreach ($export_settings[$event->Prefix] as $key => $val) {
-				$export_presets[implode('|', $val['ExportColumns'])] = $key;
-			}
-
-			$options['options'] = $export_presets;
-			$object->SetFieldOptions('ExportPresets', $options);
-		}
-
-		function getExportField($field_key)
-		{
-			$prepends = Array('__CUSTOM__', '__CATEGORY__');
-			foreach ($prepends as $prepend)
-			{
-				if (substr($field_key, 0, strlen($prepend) ) == $prepend)
-				{
-					$field_key = substr($field_key, strlen($prepend), strlen($field_key) );
-					break;
-				}
-			}
-			return $field_key;
-		}
-
-		/**
-		 * Updates uploaded files list
-		 *
-		 * @param kEvent $event
-		 */
-		function updateImportFiles(&$event)
-		{
-			if ($event->Special != 'import') {
-				return false;
-			}
-
-			$object =& $event->getObject();
-
-			$import_filenames = Array();
-
-			if ($folder_handle = opendir(EXPORT_PATH)) {
-				while (false !== ($file = readdir($folder_handle))) {
-					if (is_dir(EXPORT_PATH.'/'.$file) || substr($file, 0, 1) == '.' || strtolower($file) == 'cvs' || strtolower($file) == 'dummy' || filesize(EXPORT_PATH.'/'.$file) == 0) continue;
-
-					$file_size = formatSize( filesize(EXPORT_PATH.'/'.$file) );
-					$import_filenames[$file] = $file.' ('.$file_size.')';
-				}
-				closedir($folder_handle);
-			}
-
-			$options = $object->GetFieldOptions('ImportLocalFilename');
-			$options['options'] = $import_filenames;
-			$object->SetFieldOptions('ImportLocalFilename', $options);
-		}
-
-		/**
-		 * Returns module folder
-		 *
-		 * @param kEvent $event
-		 * @return string
-		 */
-		function getModuleFolder(&$event)
-		{
-			return $this->Application->getUnitOption($event->Prefix, 'ModuleFolder');
-		}
-
-		/**
-		 * Export form validation & processing
-		 *
-		 * @param kEvent $event
-		 */
-		function OnExportBegin(&$event)
-		{
-			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-			if (!$items_info)
-			{
-				$items_info = unserialize( $this->Application->RecallVar($event->getPrefixSpecial().'_ItemsInfo') );
-				$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
-			}
-
-			list($item_id, $field_values) = each($items_info);
-
-			$object =& $event->getObject( Array('skip_autoload' => true) );
-			$object->SetFieldsFromHash($field_values);
-			$field_values['ImportFilename'] = $object->GetDBField('ImportFilename'); //if upload formatter has renamed the file during moving !!!
-
-			$object->setID($item_id);
-			$this->setRequiredFields($event);
-
-			$export_object =& $this->Application->recallObject('CatItemExportHelper');
-
-			// save export/import options
-			if ($event->Special == 'export')
-			{
-				$export_ids = $this->Application->RecallVar($event->Prefix.'_export_ids');
-				$export_cats_ids = $this->Application->RecallVar($event->Prefix.'_export_cats_ids');
-
-				// used for multistep export
-				$field_values['export_ids'] = $export_ids ? explode(',', $export_ids) : false;
-				$field_values['export_cats_ids'] = $export_cats_ids ? explode(',', $export_cats_ids) : Array( $this->Application->GetVar('m_cat_id') );
-			}
-
-			$field_values['ExportColumns'] = $field_values['ExportColumns'] ? explode('|', substr($field_values['ExportColumns'], 1, -1) ) : Array();
-			$field_values['start_from'] = 0;
-
-			$this->Application->HandleEvent($nevent, $event->Prefix.':OnBeforeExportBegin', array('options'=>$field_values));
-			$field_values = $nevent->getEventParam('options');
-
-			$export_object->saveOptions($event, $field_values);
-
-			if( $export_object->verifyOptions($event) )
-			{
-				if ($this->_getExportSavePreset($object)) {
-					$name = $object->GetDBField('ExportPresetName');
-
-					$export_settings = $this->Application->RecallPersistentVar('export_settings');
-					$export_settings = $export_settings ? unserialize($export_settings) : array();
-					$export_settings[$event->Prefix][$name] = $field_values;
-					$this->Application->StorePersistentVar('export_settings', serialize($export_settings));
-				}
-
-				$progress_t = $this->Application->RecallVar('export_progress_t');
-				if ($progress_t) {
-					$this->Application->RemoveVar('export_progress_t');
-				}
-				else {
-					$progress_t = $export_object->getModuleFolder($event).'/'.$event->Special.'_progress';
-				}
-				$event->redirect = $progress_t;
-
-				if ($event->Special == 'import') {
-					$import_category = (int)$this->Application->RecallVar('ImportCategory');
-
-					// in future could use module root category if import category will be unavailable :)
-					$event->SetRedirectParam('m_cat_id', $import_category); // for template permission checking
-					$this->Application->StoreVar('m_cat_id', $import_category); // for event permission checking
-				}
-			}
-			else
-			{
-				// make uploaded file local & change source selection
-				$filename = getArrayValue($field_values, 'ImportFilename');
-				if ($filename) {
-					$export_object->updateImportFiles($event);
-					$object->SetDBField('ImportSource', 2);
-					$field_values['ImportSource'] = 2;
-					$object->SetDBField('ImportLocalFilename', $filename);
-					$field_values['ImportLocalFilename'] = $filename;
-					$export_object->saveOptions($event, $field_values);
-				}
-
-				$event->status = erFAIL;
-				$event->redirect = false;
-			}
-		}
-
-		/**
-		 * Returns export save preset name, when used at all
-		 *
-		 * @param kDBItem $object
-		 * @return string
-		 */
-		function _getExportSavePreset(&$object)
-		{
-			if (!array_key_exists('ExportSavePreset', $object->Fields)) {
-				return '';
-			}
-
-			return $object->GetDBField('ExportSavePreset');
-		}
-
-		/**
-		 * set required fields based on import or export params
-		 *
-		 * @param kEvent $event
-		 */
-		function setRequiredFields(&$event)
-		{
-			$required_fields['common'] = Array('FieldsSeparatedBy', 'LineEndings', 'CategoryFormat');
-
-			$required_fields['export'] = Array('ExportFormat', 'ExportFilename','ExportColumns');
-
-			$object =& $event->getObject();
-			if ($this->_getExportSavePreset($object)) {
-				$required_fields['export'][] = 'ExportPresetName';
-			}
-
-			$required_fields['import'] = Array('FieldTitles', 'ImportSource', 'CheckDuplicatesMethod'); // ImportFilename, ImportLocalFilename
-
-			if ($event->Special == 'import')
-			{
-				$import_source = Array(1 => 'ImportFilename', 2 => 'ImportLocalFilename');
-				$used_field = $import_source[ $object->GetDBField('ImportSource') ];
-
-				$required_fields[$event->Special][] = $used_field;
-				$object->Fields[$used_field]['error_field'] = 'ImportSource';
-
-				if ($object->GetDBField('FieldTitles') == 2) $required_fields[$event->Special][] = 'ExportColumns'; // manual field titles
-			}
-
-			$required_fields = array_merge($required_fields['common'], $required_fields[$event->Special]);
-			foreach ($required_fields as $required_field) {
-				$object->setRequired($required_field, true);
-			}
-		}
-
-	}
-
-?>
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_image_disabled.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/js/catalog.js
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 12657)
@@ -24,12 +24,22 @@
 	this.searchInfo = {}; // information about search (for each tab)
 }
 
-Catalog.prototype.Init = function () {
+Catalog.prototype.Init = function ($auto_hide_tabs) {
 	var $prefix = this.queryTabRegistry('prefix', this.ActivePrefix, 'prefix');
 	if ($prefix !== this.ActivePrefix && this.TabRegistry.length > 0) {
 		// ActivePrefix not set or has non-existing prefix value
 		this.ActivePrefix = this.TabRegistry[0]['prefix'];
 	}
+
+	if ($auto_hide_tabs === undefined) {
+		$auto_hide_tabs = true;
+	}
+
+	if ((this.TabRegistry.length == 1) && $auto_hide_tabs) {
+		// only one tab -> hide all tab bar
+		$('div.tab-viewport').parents('table:first').hide();
+	}
+
 	this.SetAlternativeTabs();
 	this.AfterInit();
 }
@@ -368,14 +378,28 @@
 }
 
 Catalog.prototype.displaySearch = function ($prefix) {
-	var $search_input = document.getElementById('search_keyword')
+	var $search_input = $('#search_keyword');
 
-	$search_input.setAttribute('PrefixSpecial', $prefix);
+	$search_input.attr('PrefixSpecial', $prefix);
 
 	if (this.searchInfo[$prefix]) {
-		$search_input.value = this.searchInfo[$prefix].keyword;
-		$search_input.setAttribute('Grid', this.searchInfo[$prefix].grid);
+		$search_input
+		.val(this.searchInfo[$prefix].keyword)
+		.attr('Grid', this.searchInfo[$prefix].grid);
+
+		if (this.searchInfo[$prefix].keyword) {
+			// catalog tab found and keyword present
+			$search_input.addClass('filter-active');
+		}
+		else {
+			// catalog tab found and keyword missing
+			$search_input.removeClass('filter-active');
+		}
 	}
+	else {
+		// catalog tab not found
+		$search_input.removeClass('filter-active');
+	}
 }
 
 Catalog.prototype.setCurrentCategory = function($prefix, $category_id) {
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_server_info.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_banlist.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/general/libchart/classes/view/color/ColorSet.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/color/ColorSet.php	(.../ColorSet.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/color/ColorSet.php	(.../ColorSet.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * A set of colors, used for drawing series of data.
 	 *
@@ -79,5 +81,4 @@
 		public function currentShadowColor() {
 			return current($this->shadowColorList);
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/captcha/captcha_eh.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/captcha/captcha_eh.php	(.../captcha_eh.php)	(revision 12127)
+++ branches/5.1.x/core/units/captcha/captcha_eh.php	(.../captcha_eh.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: captcha_eh.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: captcha_eh.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class CaptchaEventHandler extends kEventHandler {
 
 		/**
@@ -37,9 +39,6 @@
 			$captcha_helper =& $this->Application->recallObject('CaptchaHelper');
 			/* @var $captcha_helper kCaptchaHelper */
 
-			// generate captcha code
-			$captcha_helper->prepareCode($event->MasterEvent);
-
 			// create field for captcha code storage
 			$virtual_fields = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'VirtualFields');
 			$virtual_fields['Captcha'] = Array ('type' => 'string', 'default' => '');
Index: branches/5.1.x/core/units/dummy
===================================================================
diff -u -N
--- branches/5.1.x/core/units/dummy	(revision 12127)
+++ branches/5.1.x/core/units/dummy	(revision 0)
@@ -1 +0,0 @@
-dummy
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_conf_regional.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 12657)
@@ -1,6 +1,8 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:submissions" prefix="formsubs" title_preset="formsubs_view"/>
 
+<inp2:m_Get var="form_id" result_to_var="form_id"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:submissions:$form_id" prefix="formsubs" title_preset="formsubs_view"/>
+
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_more_brackets_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/utility/formatters/formatters_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/formatters/formatters_config.php	(.../formatters_config.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/formatters/formatters_config.php	(.../formatters_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: formatters_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: formatters_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-	$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'formatters',
 
 					'EventHandlerClass'	=>	Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
Index: branches/5.1.x/core/admin_templates/js/jquery/thickbox/thickbox.css
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/js/jquery/thickbox/thickbox.css	(.../thickbox.css)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/js/jquery/thickbox/thickbox.css	(.../thickbox.css)	(revision 12657)
@@ -92,16 +92,16 @@
 }
 
 #TB_closeAjaxWindow, .TB_closeAjaxWindow {
-	padding:7px 10px 5px 0;
-	margin-bottom:1px;
-	text-align:right;
-	float:right;
+	padding: 6px 10px 6px 0px;
+	/*margin-bottom: 1px;*/
+	text-align: right;
+	float: right;
 }
 
 #TB_ajaxWindowTitle, .TB_ajaxWindowTitle {
-	float:left;
-	padding:7px 0 5px 10px;
-	margin-bottom:1px;
+	float: left;
+	padding: 6px 0px 6px 10px;
+	/*margin-bottom: 1px;*/
 	font-weight: bold;
 }
 
@@ -165,7 +165,7 @@
 	clear:both;
 	border:none;
 	margin-bottom:-1px;
-	margin-top:1px;
+	/*margin-top:1px;*/
 	_margin-bottom:1px;
 }
 
Index: branches/5.1.x/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 12657)
@@ -117,4 +117,16 @@
 	<inp2:conf_PrintList block="config_block" per_page="-1" full_block="config_block" half_block1="config_block1" half_block2="config_block2"/>
 </table>
 
+<script type="text/javascript">
+	<inp2:m_if check="m_Get" name="refresh_tree">
+		getFrame('menu').location.reload();
+	</inp2:m_if>
+
+	<inp2:m_if check="m_Get" name="refresh_all">
+		var $menu_frame = getFrame('menu');
+
+		$menu_frame.parent.location.href = $menu_frame.parent.location.href;
+	</inp2:m_if>
+</script>
+
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_update_rates.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_view_item_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_affiliate_payment_type_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/email_events/email_events_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: email_events_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,105 +12,146 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
-					'Prefix'			=>	'emailevents',
-					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
-					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class'=>'EmailEventsEventsHandler','file'=>'email_events_event_handler.php','build_event'=>'OnBuild'),
-					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
-					'AutoLoad'			=>	true,
+defined('FULL_PATH') or die('restricted access!');
 
-					'QueryString'		=>	Array(
-												1	=>	'id',
-												2	=>	'page',
-												3	=>	'event',
-											),
+	$config = Array (
+		'Prefix' => 'emailevents',
+		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+		'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+		'EventHandlerClass' => Array ('class' => 'EmailEventsEventsHandler', 'file' => 'email_events_event_handler.php', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
 
-					'IDField'			=>	'EventId',
+		'AutoLoad' => true,
 
-					'StatusField'		=>	Array('Enabled'),
+		'QueryString' => Array (
+			1 => 'id',
+			2 => 'Page',
+			3 => 'event',
+			4 => 'mode',
+		),
 
-					'TitleField'		=>	'Event',
+		'IDField' => 'EventId',
+		'StatusField' => Array ('Enabled'),
+		'TitleField' => 'Event',
 
-					'TitlePresets'		=>	Array(
-												'email_settings_list' => Array('prefixes'	=> Array('emailevents.module_List'), 'format' => '!la_title_EmailSettings!'),
+		'TitlePresets' => Array (
+			'default' => Array (
+				'edit_status_labels' => Array ('emailevents' => '!la_title_EditingEmailEvent!'),
+			),
 
-												'email_send_form' => Array('prefixes' => Array(), 'format' => '!la_title_SendEmail!'),
-												'email_prepare' => Array('prefixes' => Array(), 'format' => '!la_title_PreparingEmailsForSending!. !la_title_PleaseWait!'),
-												'email_send' => Array('prefixes' => Array(), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
-												'email_send_complete' => Array('prefixes' => Array(), 'format' => '!la_title_SendMailComplete!'),
-											),
+			'email_settings_list' => Array ('prefixes'	=> Array ('emailevents.module_List'), 'format' => '!la_title_EmailSettings!'),
 
-					'PermSection'		=>	Array('main' => 'in-portal:configure_lang'),
+			'email_settings_edit' => Array (
+				'prefixes' => Array ('emailevents'), 'format' => "#emailevents_status# '#emailevents_titlefield#'",
+				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+			),
 
-					'FilterMenu'		=>	Array(
-												'Groups' => Array(
-													Array('mode' => 'AND', 'filters' => Array('show_enabled','show_disabled','show_frontonly'), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array(
-													'show_enabled'	=>	Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
-													'show_disabled'	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0'  ),
-													'show_frontonly'	=>	Array('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2'  ),
-												)
-											),
+			'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
+			'email_prepare' => Array ('prefixes' => Array (), 'format' => '!la_title_PreparingEmailsForSending!. !la_title_PleaseWait!'),
+			'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
+			'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'),
+		),
 
-					'TableName'			=>	TABLE_PREFIX.'Events',
+		'PermSection' => Array ('main' => 'in-portal:configure_lang'),
 
-					'CalculatedFields' => Array(
-								'' => Array (
-										'FromUser'	=>	'u.Login',
-									)
-								),
+		'FilterMenu' => Array (
+			'Groups' => Array (
+				Array ('mode' => 'AND', 'filters' => Array ('show_enabled', 'show_disabled', 'show_frontonly'), 'type' => WHERE_FILTER),
+			),
 
-					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
-															FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.FromUserId = u.PortalUserId',
-											), // key - special, value - list select sql),
+			'Filters' => Array (
+				'show_enabled' => Array ('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
+				'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0'  ),
+				'show_frontonly' => Array ('label' => 'la_Text_FrontOnly', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 2'  ),
+			)
+		),
 
-					'ItemSQLs'			=>	Array(	''=>'SELECT * FROM %s'),
+		'TableName' => TABLE_PREFIX . 'Events',
 
-					'ListSortings'	=> 	Array(
-												'' 			=>	Array('Sorting' => Array('Module' => 'asc', 'Description'	=> 'asc') ),
+		'CalculatedFields' => Array (
+			'' => Array (
+				'FromUser' => 'u.Login',
+			)
+		),
 
-												'module'	=>	Array('Sorting'	=> Array('Description'	=> 'asc') ),
-										),
+		'ListSQLs' => Array (
+			'' => '	SELECT %1$s.* %2$s
+					FROM %1$s
+					LEFT JOIN ' . TABLE_PREFIX . 'PortalUser u ON %1$s.FromUserId = u.PortalUserId',
+		),
 
-					'Fields'			=>	Array(
-													'EventId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-										            'Event' => Array('type' => 'string','not_null' => '1','default' => ''),
-										            'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
-										            'Enabled' => Array('type'=>'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Text_FrontOnly'), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1),
-										            'FromUserId' => Array('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(-1=>'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required'=>1, 'not_null' => 1, 'default' => -1),
-										            'Module' => Array('type' => 'string','not_null' => '1','default' => ''),
-										            'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
-										            'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1, 'default' => 0, 'not_null' => 1),
-									        ),
-					'VirtualFields'		=>	Array(
-													'FromUser'	=>	Array(),
-											),
+		'ListSortings' => Array (
+			'' => Array ('Sorting' => Array ('Module' => 'asc', 'Description'	=> 'asc')),
+			'module' => Array ('Sorting' => Array ('Description' => 'asc') ),
+		),
 
-					'Grids'	=> Array(
-						'Default' => Array (
-							'Icons' => Array('default'=>'icon16_custom.gif'),
-							'Fields' => Array(
-								'EventId' => Array('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'),
-								'Description'	=>	Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter'),
-								'Event'			=>	Array( 'title'=>'la_col_Event', 'filter_block' => 'grid_like_filter'),
-								'Module'		=>	Array( 'title'=>'la_col_Module', 'filter_block' => 'grid_like_filter'),
-								'Type'			=>	Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'),
-								'Enabled'		=>	Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
-							),
-						),
+		'Fields' => Array (
+			'EventId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+            'Event' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
+            'ReplacementTags' => Array ('type' => 'string', 'default' => NULL),
 
-						'EmailSettings' => Array (
-							'Icons' => Array('default'=>'icon16_custom.gif'),
-							'Fields' => Array(
-								'EventId' => Array('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter'),
-								'Description' => Array('title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td' ),
-		            			'Type' => Array('title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'),
-								'Enabled' => Array('title'=>'la_col_Status', 'filter_block' => 'grid_options_filter'),
-		            			'FromUser' => Array('title'=>'la_col_FromToUser', 'filter_block' => 'grid_like_filter'),
-							),
-						),
-					),
+            'Enabled' => Array (
+            	'type' => 'int',
+            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+            	'not_null' => 1, 'default' => 1
+            ),
+
+            'FrontEndOnly' => Array (
+            	'type' => 'int',
+            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+            	'not_null' => 1, 'default' => 0
+            ),
+
+            'FromUserId' => Array (
+            	'type' => 'int',
+            	'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (-1 => 'root'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login',
+            	'default' => NULL
+            ),
+
+            'Module' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
+            'Description' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
+            'Type' => Array (
+            	'type' => 'int',
+            	'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Text_Admin', 0 => 'la_Text_User'), 'use_phrases' => 1,
+            	'not_null' => 1, 'required' => 1, 'default' => 0
+            ),
+    	),
+
+		'VirtualFields' => Array (
+			'FromUser'	=>	Array ('type' => 'string', 'default' => ''),
+		),
+
+		'Grids'	=> Array (
+			'Default' => Array (
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					0 => 'icon16_disabled.png',
+					1 => 'icon16_item.png',
+				),
+				'Fields' => Array (
+					'EventId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+					'Description'	=>	Array ( 'title' => 'la_col_Description', 'data_block' => 'label_grid_checkbox_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'Event'			=>	Array ( 'title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+					'Module'		=>	Array ( 'title' => 'la_col_Module', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+					'Type'			=>	Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
+					'Enabled'		=>	Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+				),
+			),
+
+			'EmailSettings' => Array (
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					0 => 'icon16_disabled.png',
+					1 => 'icon16_item.png',
+				),
+				'Fields' => Array (
+					'EventId' => Array ('title' => 'la_col_Id', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+					'Description' => Array ('title' => 'la_col_EventDescription', 'data_block' => 'label_grid_checkbox_td', 'width' => 250, ),
+					'FromUser' => Array ('title' => 'la_col_FromToUser', 'data_block' => 'from_user_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+        			'Type' => Array ('title' => 'la_col_RecipientType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
+					'FrontEndOnly' => Array ('title' => 'la_col_FrontEndOnly', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
+					'Enabled' => Array ('title' => 'la_col_Enabled', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+				),
+			),
+		),
 	);
\ No newline at end of file
Index: branches/5.1.x/core/units/thesaurus/thesaurus_tp.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/thesaurus/thesaurus_tp.php	(.../thesaurus_tp.php)	(revision 12127)
+++ branches/5.1.x/core/units/thesaurus/thesaurus_tp.php	(.../thesaurus_tp.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: thesaurus_tp.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: thesaurus_tp.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class ThesaurusTagProcessor extends kDBTagProcessor {
 
 		function SubSearchLink($params)
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_file_primary.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/tools/sql_query.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/tools/sql_query.tpl	(.../sql_query.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/tools/sql_query.tpl	(.../sql_query.tpl)	(revision 12657)
@@ -8,14 +8,16 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('query_database', '<inp2:m_phrase label="la_ToolTip_RunSQL" escape="1"/>', function() {
 					submit_event('adm','OnSqlQuery');
 						}
 					) );
+			<!--##
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
 					location.href = '<inp2:m_Link t="sections_list" pass="m" section="in-portal:tools" module="In-Portal" no_amp="1"/>';
 						}
 					) );
+			##-->
 				a_toolbar.Render();
 			</script>
 		</td>
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_settings_general.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/db/cat_dbitem.php
===================================================================
diff -u -N -r12535 -r12657
--- branches/5.1.x/core/kernel/db/cat_dbitem.php	(.../5.0.x/core/kernel/db/cat_dbitem.php)	(revision 12535)
+++ branches/5.1.x/core/kernel/db/cat_dbitem.php	(.../5.1.x/core/kernel/db/cat_dbitem.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_dbitem.php 12535 2009-09-16 18:11:57Z alex $
+* @version	$Id: cat_dbitem.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_add_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_modify_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upload_formatter.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: upload_formatter.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -92,7 +92,7 @@
 				$real_name = $this->ValidateFileName($this->FullPath, $real_name, $files2delete);
 				$file_name = $this->FullPath.$real_name;
 
-				$tmp_file = (defined('WRITEABLE') ? WRITEABLE.'/tmp/' : FULL_PATH.'/kernel/cache/').$swf_uploaded_ids[$i].'_'.$swf_uploaded_names[$i];
+				$tmp_file = WRITEABLE . '/tmp/' . $swf_uploaded_ids[$i].'_'.$swf_uploaded_names[$i];
 				rename($tmp_file, $file_name);
 
 				@chmod($file_name, 0666);
Index: branches/5.1.x/core/admin_templates/skins/skin_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 12657)
@@ -35,7 +35,7 @@
 
 					  		a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-								a_toolbar.AddButton( new ToolBarButton('primary_theme', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>', function() {
+								a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>', function() {
 											submit_event('skin','OnSetPrimary');
 										}
    							) );
@@ -66,7 +66,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="skin" IdField="SkinId" grid="Default" grid_filters="1"/>
 <script type="text/javascript">
-	Grids['skin'].SetDependantToolbarButtons( new Array('edit', 'delete', 'primary_theme', 'clone') );
+	Grids['skin'].SetDependantToolbarButtons( new Array('edit', 'delete', 'setprimary', 'clone') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_file_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_image_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_image.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/js/script.js
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/js/script.js	(.../script.js)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/js/script.js	(.../script.js)	(revision 12657)
@@ -23,8 +23,12 @@
 	replaceFireBug();
 }
 
-function use_popups($prefix_special, $event) {
-	return $use_popups;
+function use_popups($prefix_special, $event, $mode) {
+	if ($mode === undefined || $mode == 'popup') {
+		return $use_popups;
+	}
+
+	return $modal_windows;
 }
 
 function getArrayValue()
@@ -538,9 +542,37 @@
 	);
 }
 
-function translate_phrase($label, $template) {
+function translate_phrase($label, $edit_template, $options) {
 	set_hidden_field('phrases_label', $label);
-	open_popup('phrases', 'OnNew', $template);
+	var $event = $options.event === undefined ? 'OnNew' : $options.event;
+
+	if ($options.simple_mode !== undefined) {
+		Application.SetVar('simple_mode', $options.simple_mode ? 1 : 0);
+
+		if ($options.simple_mode) {
+			Application.SetVar('front', 1);
+		}
+	}
+	else {
+		Application.SetVar('front', null);
+		Application.SetVar('simple_mode', null);
+		Application.SetVar('phrases_label', null);
+	}
+
+	if (use_popups('phrases', $event)) {
+		open_popup('phrases', $event, $edit_template, null, function() {
+			Application.SetVar('front', null);
+			Application.SetVar('simple_mode', null);
+		});
+	}
+	else {
+		opener_action('d');
+		submit_event('phrases', $event, $edit_template);
+
+		Application.SetVar('front', null);
+		Application.SetVar('simple_mode', null);
+		Application.SetVar('phrases_label', null);
+	}
 }
 
 function direct_edit($prefix_special, $url) {
@@ -850,7 +882,7 @@
 	$window.top.document.title = (main_title.length ? main_title + ' - ' : '') + $title;
 
 	if ($modal_windows) {
-		$window.TB.setWindowTitle($title);
+		$window.TB.setWindowTitle('');
 	}
 }
 
Index: branches/5.1.x/core/kernel/db/cat_dblist.php
===================================================================
diff -u -N -r12343 -r12657
--- branches/5.1.x/core/kernel/db/cat_dblist.php	(.../5.0.x/core/kernel/db/cat_dblist.php)	(revision 12343)
+++ branches/5.1.x/core/kernel/db/cat_dblist.php	(.../5.1.x/core/kernel/db/cat_dblist.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_dblist.php 12343 2009-08-18 10:32:30Z alex $
+* @version	$Id: cat_dblist.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
Index: branches/5.1.x/core/admin_templates/import/import_start.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/import/import_start.tpl	(.../import_start.tpl)	(revision 12657)
@@ -14,7 +14,7 @@
   	<td>
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('import', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
 							submit_event('adm','OnCSVImportBegin');
 						}
 					) );
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_conf_regional.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/custom_data/custom_data_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/units/custom_data/custom_data_event_handler.php	(.../custom_data_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_data_event_handler.php 11895 2009-07-08 10:14:03Z alex $
+* @version	$Id: custom_data_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class CustomDataEventHandler extends kDBEventHandler {
 
 		/**
@@ -173,5 +175,4 @@
 			$this->Application->setUnitOption($prefix, 'CustomFields', $custom_fields);
 			$this->Application->setUnitOption($prefix, 'VirtualFields', $virtual_fields);
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/forms/forms_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/forms/forms_list.tpl	(.../forms_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/forms/forms_list.tpl	(.../forms_list.tpl)	(revision 12657)
@@ -14,7 +14,7 @@
   			}
 
   			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_form', '<inp2:m_phrase label="la_ToolTip_New_Form" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Form" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							std_precreate_item('form', 'forms/forms_edit')
 						} ) );
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_paymenttype.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_advanced_view.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/category_items/category_items_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/category_items/category_items_config.php	(.../category_items_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/category_items/category_items_config.php	(.../category_items_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: category_items_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: category_items_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array (
 					'Prefix'			=>	'ci',
 					'ItemClass'			=>	Array('class'=>'CategoryItems_DBItem','file'=>'category_items_dbitem.php','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
@@ -33,7 +35,7 @@
 												3	=>	'event',
 											),
 					'IDField'			=>	'CategoryId',	// in this case idfield doesn't exit in destination table
-					'StatusField'		=>	Array('CategoryStatus'),	// field, that is affected by Approve/Decline events
+					'StatusField'		=>	Array('PrimaryCat'),	// field, that is affected by Approve/Decline events
 
 					'TableName'		=>	TABLE_PREFIX.'CategoryItems',
 					'ParentTableKey'=>	'ResourceId',
@@ -67,22 +69,24 @@
 												    'ItemPrefix' => Array('type' => 'string','not_null'=>1,'default'=>''),
 												    'Filename' => Array('type' => 'string','not_null'=>1,'default'=>''),
 											),
-											
+
 					'VirtualFields'	=> 	Array (
 												'CategoryName'		=>	Array(),
 												'DummyId' 			=>	Array(),
 												'CategoryStatus'	=>	Array(),
 										),
 
-					'Grids'	=> Array(
-								'Default'		=>	Array(
-																	'Icons' => Array('default' => 'icon16_cat.gif', 0 => 'icon16_cat_disabled.gif', 1 => 'icon16_cat.gif', 2 => 'icon16_cat_pending.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
-																	'Fields' => Array(
-																			'CategoryName' => Array( 'title'=>'la_col_Category', 'data_block' => 'grid_checkbox_category_td'),
-																			),
+					'Grids' => Array (
+						'Default' => Array (
+							'Icons' => Array (
+								'default' => 'icon16_item.png',
+								0 => 'icon16_item.png',
+								1 => 'icon16_primary.png',
+							),
 
-																),
-													),
-	);
-
-?>
\ No newline at end of file
+							'Fields' => Array (
+								'CategoryName' => Array( 'title'=>'la_col_Category', 'data_block' => 'grid_checkbox_category_td'),
+							),
+						),
+					),
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_users.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_tool_restore.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/install/step_templates/select_theme.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/install/step_templates/select_theme.tpl	(.../select_theme.tpl)	(revision 12127)
+++ branches/5.1.x/core/install/step_templates/select_theme.tpl	(.../select_theme.tpl)	(revision 12657)
@@ -15,8 +15,9 @@
 						$default_theme = 'default2007';
 					}
 
-					if (file_exists(FULL_PATH . '/themes/default2009')) {
-						$default_theme = 'default2009';
+					// default theme since 5.0.1
+					if (file_exists(FULL_PATH . '/themes/simple')) {
+						$default_theme = 'simple';
 					}
 				}
 
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_summary_logs.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_community.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_browse-site.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/incs/cms.css
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/incs/cms.css	(.../cms.css)	(revision 12657)
@@ -16,7 +16,7 @@
 	padding: 5px;
 }
 
-div.cms-section-properties-btn, div.cms-edit-btn, div.cms-save-layout-btn {
+div.cms-section-properties-btn, div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
 	padding: 2px 5px;
 	font-family: Arial, Verdana;
 	font-size: 13px;
@@ -26,19 +26,39 @@
 	color: black;
 	cursor: pointer;
 	-moz-border-radius: 10px;
+	z-index: 99;
+}
 
+div.cms-edit-btn, div.cms-edit-block-btn, div.cms-edit-design-btn {
 	margin-top: -10px;
-	z-index: 99;
 }
 
+div.cms-edit-design-btn-container {
+	position: absolute;
+	margin-left: -10px;
+	margin-top: -10px;
+	display: none;
+}
+
+div.cms-edit-design-btn-container div.cms-edit-block-btn, div.cms-edit-design-btn-container div.cms-edit-design-btn {
+	float: left;
+	display: block;
+	position: relative;
+	margin: 0px;
+}
+
+div.cms-edit-design-btn-container div.cms-edit-design-btn {
+	margin-left: 4px;
+}
+
 /* === Styles for "Section Properties" button === */
 div.cms-section-properties-btn {
 	float: right;
 	position: relative;
-
-	margin-right: -10px;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
 }
 
 div.cms-section-properties-btn-container {
@@ -56,27 +76,73 @@
 	border: 2px solid #FF6E00;
 	background-color: #FFCC00;
 	opacity: 0.5;
+	filter: alpha(opacity=50);
 }
 
-/* === Styles for "Save Layout" button === */
-div.cms-save-layout-btn {
-	float: left;
-	position: absolute;
+div.cms-edit-block-btn {
+	margin-left: -10px;
+	border: 2px solid #FF6E00;
+	background-color: #FFCC00;
+	display: none;
+}
 
+div.cms-edit-design-btn {
 	margin-left: -10px;
 	border: 2px solid #A1D0A1;
 	background-color: #CCFF00;
+	display: none;
 }
 
+/* === Styles for "Save" and "Cancel" buttons (for layout) === */
+div.cms-layout-btn-container {
+	position: absolute;
+	display: none;
+	z-index: 99;
+}
+
+div.cms-save-layout-btn, div.cms-cancel-layout-btn {
+	float: left;
+	padding: 2px 5px;
+	font-family: Arial, Verdana;
+	font-size: 13px;
+	font-weight: normal;
+	width: auto;
+	color: black;
+	cursor: pointer;
+	/*opacity: 0.5;
+	filter: alpha(opacity=50);*/
+	-moz-border-radius: 10px;
+}
+
+div.cms-save-layout-btn {
+	color: white;
+	border: 2px solid #1C960C;
+	background-color: #24B30D;
+}
+
+div.cms-cancel-layout-btn {
+	color: white;
+	border: 2px solid #C81900;
+	background-color: #DE2A00;
+}
+
+div.cms-cancel-layout-btn {
+	margin-left: 4px;
+}
+
 /* === Styles for Template Editor === */
-div.block-edit-btn-container {
+div.block-edit-block-btn-container, div.block-edit-design-btn-container {
 	border: 1px dashed transparent;
 }
 
-div.block-edit-btn-container-over {
+div.block-edit-block-btn-container-over, div.block-edit-design-btn-container-over {
 	border-color: #FF6E00;
 }
 
+/*div.block-edit-design-btn-container-over {
+	border-color: #A1D0A1;
+}*/
+
 /* === Styles for element moving/sorting in theme === */
 div.movable-area {
 	min-height: 200px;
@@ -85,4 +151,26 @@
 .move-helper {
 	border: 3px dashed #666;
 	/*width: auto !important;*/
+}
+
+/* === Styles for phrase translation links === */
+span[name='cms-translate-phrase'] {
+	text-decoration: none;
+	border: 1px dashed transparent;
+	padding: 3px;
+
+}
+
+span[name='cms-translate-phrase']:hover {
+	border-color: #FF6E00;
+}
+
+span[name='cms-translate-phrase'] .cms-btn-text {
+	font-size: 9px;
+}
+
+span[name='cms-translate-phrase'] .cms-edit-btn {
+	display: none;
+	opacity: 1;
+	filter: alpha(opacity=100);
 }
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_flip_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/pdf/css_defaults.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/pdf/css_defaults.php	(.../css_defaults.php)	(revision 12127)
+++ branches/5.1.x/core/units/pdf/css_defaults.php	(.../css_defaults.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: css_defaults.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: css_defaults.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,8 +12,11 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class kCSSDefaults {
-	public static $DEFAULT_STYLE = 
+
+	public static $DEFAULT_STYLE =
 	 'html, address,
 		blockquote,
 		body, dd, div,
@@ -37,7 +40,7 @@
 		th              { font-weight: bolder; text-align: center }
 		caption         { text-align: center }
 		body            { margin: 8px }
-		
+
 		h1              { font-size: 2em; margin: .67em 0 }
 		h2              { font-size: 1.5em; margin: .75em 0 }
 		h3              { font-size: 1.17em; margin: .83em 0 }
@@ -80,21 +83,21 @@
 		center          { text-align: center }
 		:link, :visited { text-decoration: underline }
 		:focus          { outline: thin dotted invert }
-		
+
 		/* Begin bidirectionality settings (do not change) */
 		BDO[DIR="ltr"]  { direction: ltr; unicode-bidi: bidi-override }
 		BDO[DIR="rtl"]  { direction: rtl; unicode-bidi: bidi-override }
-		
+
 		*[DIR="ltr"]    { direction: ltr; unicode-bidi: embed }
 		*[DIR="rtl"]    { direction: rtl; unicode-bidi: embed }
-		
+
 		/*@media print {
 		  h1            { page-break-before: always }
 		  h1, h2, h3,
 		  h4, h5, h6    { page-break-after: avoid }
 		  ul, ol, dl    { page-break-before: avoid }
 		}*/';
-	 
+
 	public static $CSS_PROPERTIES = array(
 		'BACKGROUND-ATTACHMENT' => array(
 			'initial' =>'scroll',
@@ -643,22 +646,22 @@
 			'percentages' => ''
 		),
 	);
-	
+
 	static function IsInherited($property)
 	{
 		return kCSSDefaults::$CSS_PROPERTIES[$property]['inherited'];
 //		return isset(kCSSDefaults::$CSS_PROPERTIES[$property]) ?  : false;
 	}
-	
+
 	static function IsValid($property)
 	{
 		return isset(kCSSDefaults::$CSS_PROPERTIES[$property]);
 	}
-	
+
 	static function GetDefaultValue($property)
 	{
 		return kCSSDefaults::$CSS_PROPERTIES[$property]['initial'];
 //		return isset(kCSSDefaults::$CSS_PROPERTIES[$property]) ? kCSSDefaults::$CSS_PROPERTIES[$property]['initial'] : false;
 	}
-	
+
 }
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_add.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/install/incs/img/logo.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/theme_files/theme_files_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/theme_files/theme_files_config.php	(.../theme_files_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/theme_files/theme_files_config.php	(.../theme_files_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: theme_files_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: theme_files_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'theme-file',
 					'ItemClass'			=>	Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 					'ListClass'			=>	Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
@@ -65,16 +67,18 @@
 
 					'Grids' => Array (
 						'Default' => Array (
-							'Icons' => Array('default' => 'icon16_custom.gif'),
+							'Icons' => Array (
+								'default' => 'icon16_item.png',
+								0 => 'icon16_disabled.png',
+								1 => 'icon16_item.png',
+							),
 							'Fields' => Array (
-								'FileId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-								'FilePath' => Array( 'title'=>'la_col_FilePath',),
-								'FileName' 	=> Array( 'title'=>'la_col_FileName',),
-								'Description' 	=> Array( 'title'=>'la_col_Description',),
+								'FileId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'FileName' 	=> Array( 'title'=>'la_col_FileName', 'width' => 150, ),
+								'FilePath' => Array( 'title'=>'la_col_FilePath', 'width' => 300, ),
+								'Description' 	=> Array( 'title'=>'la_col_Description', 'width' => 300, ),
 							),
 
 						),
 					),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/units/visits/visits_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/visits/visits_config.php	(.../visits_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: visits_config.php 11902 2009-07-15 01:07:23Z dmitrya $
+* @version	$Id: visits_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,39 +12,41 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array (
 					'Prefix'			=>	'visits',
-					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
-					'ListClass'			=>	Array('class'=>'VisitsList','file'=>'visits_list.php','build_event'=>'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class'=>'VisitsEventHandler','file'=>'visits_event_handler.php','build_event'=>'OnBuild'),
-					'TagProcessorClass' =>	Array('class'=>'VisitsTagProcessor','file'=>'visits_tag_processor.php','build_event'=>'OnBuild'),
+					'ItemClass'			=>	Array ('class' => 'kDBItem','file' => '','build_event' => 'OnItemBuild'),
+					'ListClass'			=>	Array ('class' => 'VisitsList','file' => 'visits_list.php','build_event' => 'OnListBuild'),
+					'EventHandlerClass'	=>	Array ('class' => 'VisitsEventHandler','file' => 'visits_event_handler.php','build_event' => 'OnBuild'),
+					'TagProcessorClass' =>	Array ('class' => 'VisitsTagProcessor','file' => 'visits_tag_processor.php','build_event' => 'OnBuild'),
 					'AutoLoad'			=>	true,
 
-					'QueryString'		=>	Array(
+					'QueryString'		=>	Array (
 												1	=>	'id',
 												2	=>	'Page',
 												3	=>	'event',
 												4	=>	'mode',
 											),
 
-					'Hooks'				=>	Array(
-													Array(
+					'Hooks'				=>	Array (
+													Array (
 														'Mode' => hBEFORE,
 														'Conditional' => false,
 														'HookToPrefix' => 'adm',
 														'HookToSpecial' => '',
-														'HookToEvent' => Array( 'OnStartup' ),
+														'HookToEvent' => Array ( 'OnStartup' ),
 														'DoPrefix' => '',
 														'DoSpecial' => '',
 														'DoEvent' => 'OnRegisterVisit',
 													),
 
-													Array(
+													Array (
 														'Mode' => hAFTER,
 														'Conditional' => false,
 														'HookToPrefix' => 'u',
 														'HookToSpecial' => '*',
-														'HookToEvent' => Array( 'OnLogin' ),
+														'HookToEvent' => Array ( 'OnLogin' ),
 														'DoPrefix' => '',
 														'DoSpecial' => '',
 														'DoEvent' => 'OnUserLogin',
@@ -54,33 +56,33 @@
 					'IDField' 			=>	'VisitId',
 					'TableName'			=>	TABLE_PREFIX.'Visits',
 
-					'PermSection'		=>	Array('main' => 'in-portal:visits'),
+					'PermSection'		=>	Array ('main' => 'in-portal:visits'),
 
 					'Sections' => Array (
 						'in-portal:visits' => Array (
 							'parent'		=>	'in-portal:reports',
 							'icon'			=>	'visits',
-							'label'			=>	'la_tab_Visits',
+							'label'			=>	'la_tab_VisitorLog',
 							'url'			=>	Array ('t' => 'logs/visits/visits_list', 'pass' => 'm'),
 							'permissions'	=>	Array ('view', 'delete'),
 							'priority'		=>	6,
 							'type'			=>	stTREE,
 						),
 					),
 
-					'TitlePresets'		=>	Array(
-										'visits_list' => Array(
-											'prefixes' => Array('visits_List'), 'format' => "!la_title_Visits!",
-											'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'),
+					'TitlePresets'		=>	Array (
+										'visits_list' => Array (
+											'prefixes' => Array ('visits_List'), 'format' => "!la_title_Visits!",
+											'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'),
 											),
 
-										'visits.incommerce_list' =>	Array(
-											'prefixes' => Array('visits.incommerce_List'), 'format' => "!la_title_Visits!",
-											'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'reset', 'export', 'view'),
+										'visits.incommerce_list' =>	Array (
+											'prefixes' => Array ('visits.incommerce_List'), 'format' => "!la_title_Visits!",
+											'toolbar_buttons' => Array ('search', 'search_reset', 'refresh', 'delete', 'export', 'view'),
 											),
 										),
 
-					'CalculatedFields' => Array(
+					'CalculatedFields' => Array (
 								'' => Array (
 										'UserName'	=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)',
 									),
@@ -95,10 +97,10 @@
 									),
 								),
 
-					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
+					'ListSQLs'			=>	Array (	'' => '	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId',
-													'incommerce'=>'
+													'incommerce' => '
 															SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
@@ -108,67 +110,67 @@
 														),
 
 
-					'ItemSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s
+					'ItemSQLs'			=>	Array (	'' => '	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId',
-													'incommerce'=>'	SELECT %1$s.* %2$s
+													'incommerce' => '	SELECT %1$s.* %2$s
 															FROM %1$s
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
 															LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
 															LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
 															LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId',
 														),
 
-					'ListSortings'	=> 	Array(
-																'' => Array(
-																	'Sorting' => Array('VisitDate' => 'desc'),
+					'ListSortings'	=> 	Array (
+																'' => Array (
+																	'Sorting' => Array ('VisitDate' => 'desc'),
 																)
 															),
 
-					'Fields' => Array(
-										'VisitId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-										'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => 1, 'default' => 0),
-										'Referer' => Array('type' => 'string','not_null' => '1','default' => ''),
-            							'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''),
-										'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0),
-										'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => -2),
+					'Fields' => Array (
+										'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+										'VisitDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => 1, 'default' => 0),
+										'Referer' => Array ('type' => 'string','not_null' => '1','default' => ''),
+            							'IPAddress' => Array ('type' => 'string','not_null' => '1','default' => ''),
+										'AffiliateId' => Array ('type' => 'int','formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field' => 'AffiliateId','left_title_field' => 'Login','not_null'=>1,'default'=>0),
+										'PortalUserId' => Array ('type' => 'int','not_null' => '1','default' => -2),
 							    ),
 
-					'VirtualFields'	=> 	Array(
-												'UserName'						=>	Array('type'=>'string'),
-												'AffiliateUser'					=>	Array('type'=>'string'),
-												'AffiliatePortalUserId'			=>	Array('type'=>'int'),
-												'OrderTotalAmount'				=>	Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00', 'totals' => 'SUM'),
-												'OrderTotalAmountSum'			=>	Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'),
-												'OrderAffiliateCommission' 		=>	Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000', 'totals' => 'SUM'),
-												'OrderAffiliateCommissionSum' 	=>	Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'),
-												'OrderId'						=>	Array('type' => 'int', 'default' => '0'),
+					'VirtualFields'	=> 	Array (
+												'UserName'						=>	Array ('type' => 'string'),
+												'AffiliateUser'					=>	Array ('type' => 'string'),
+												'AffiliatePortalUserId'			=>	Array ('type' => 'int'),
+												'OrderTotalAmount'				=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1','default' => '0.00', 'totals' => 'SUM'),
+												'OrderTotalAmountSum'			=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1','default' => '0.00'),
+												'OrderAffiliateCommission' 		=>	Array ('type' => 'double', 'formatter' => 'kFormatter','format' => '%.02f', 'not_null' => '1','default' => '0.0000', 'totals' => 'SUM'),
+												'OrderAffiliateCommissionSum' 	=>	Array ('type' => 'double', 'formatter' => 'kFormatter','format' => '%.02f', 'not_null' => '1','default' => '0.0000'),
+												'OrderId'						=>	Array ('type' => 'int', 'default' => '0'),
 											),
 
-					'Grids'	=> Array(
-								'Default'		=>	Array(
-																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
-																	'Fields' => Array(
-																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter'),
-																			'IPAddress'		=>	Array( 'title'=>'la_col_IP', 'filter_block' => 'grid_like_filter' ),
-																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ),
-																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
-																		),
-														),
-								'visitsincommerce'		=>	Array(
-																	'Icons' => Array('default'=>'icon16_custom.gif'),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
-																	'Fields' => Array(
-																			'VisitDate'		=>	Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter' ),
-																			'IPAddress'		=>	Array( 'title'=>'la_col_IP', 'filter_block' => 'grid_like_filter' ),
-																			'Referer' 		=>	Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter' ),
-																			'UserName'		=>	Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
-																			'AffiliateUser'	=>	Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter'),
-																			'OrderTotalAmountSum'	=>	Array( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter'),
-																			'OrderAffiliateCommissionSum'	=>	Array( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter'),
-																		),
-														),
-								),
+					'Grids'	=> Array (
 
-	);
+						'Default' => Array (
+							'Icons' => Array ('default' => 'icon16_item.png'),
+							'Fields' => Array (
+								'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
+								'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+								'UserName' => Array ('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+							),
+						),
 
-?>
\ No newline at end of file
+						'visitsincommerce' => Array (
+							'Icons' => Array ('default' => 'icon16_item.png'),
+							'Fields' => Array (
+								'VisitDate' => Array ( 'title' => 'la_col_VisitDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+								'IPAddress' => Array ( 'title' => 'la_col_IP', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
+								'Referer' => Array ( 'title' => 'la_col_Referer', 'data_block' => 'grid_referer_td', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+								'UserName' => Array ( 'title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'AffiliateUser'	=> Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 105, ),
+								'OrderTotalAmountSum' => Array ( 'title' => 'la_col_OrderTotal', 'filter_block' => 'grid_range_filter', 'width' => 95, ),
+								'OrderAffiliateCommissionSum' => Array ( 'title' => 'la_col_Commission', 'filter_block' => 'grid_range_filter', 'width' => 160, ),
+							),
+						),
+					),
+
+	);
\ No newline at end of file
Index: branches/5.1.x/core/units/sections/sections_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: sections_config.php 11947 2009-07-21 06:01:20Z dmitrya $
+* @version	$Id: sections_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,10 +12,12 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'core-sections',
 		'EventHandlerClass' => Array ('class' => 'SiteConfigEventHandler', 'file' => 'site_config_eh.php', 'build_event' => 'OnBuild'),
-		'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array ('class' => 'SiteConfigTagProcessor', 'file' => 'site_config_tp.php', 'build_event' => 'OnBuild'),
 
 		'Hooks' => Array (
 			Array (
@@ -66,18 +68,18 @@
 			),
 
 			'in-portal:reviews' => Array (
-				'parent'		=>	'in-portal:users',
+				'parent'		=>	'in-portal:site',
 				'icon'			=>	'reviews',
 				'label'			=>	'la_tab_Reviews',
 				'url'			=>	Array ('t' => 'reviews/reviews', 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	5,
+				'priority'		=>	3.5,
 				'type'			=>	stTREE,
 			),
 
 			'in-portal:users' => Array (
 				'parent'		=>	'in-portal:root',
-				'icon'			=>	'community',
+				'icon'			=>	'user_management',
 				'label'			=>	'la_tab_Community',
 				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
@@ -149,8 +151,9 @@
 
 			'in-portal:website_setting_folder' => Array (
 				'parent'		=>	'in-portal:system',
-				'icon'			=>	'conf',
+				'icon'			=>	'conf_website',
 				'label'			=>	'la_title_Website',
+				'use_parent_header' => 1,
 				'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	1,
@@ -171,7 +174,7 @@
 
 			'in-portal:configure_advanced' => Array (
 				'parent'		=>	'in-portal:website_setting_folder',
-				'icon'			=>	'settings_general',
+				'icon'			=>	'conf_advanced',
 				'label'			=>	'la_title_Advanced',
 				'url'			=>	Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'edit'),
@@ -194,42 +197,42 @@
 
 			'in-portal:backup' => Array (
 				'parent'		=>	'in-portal:tools',
-				'icon'			=>	'tool_backup',
+				'icon'			=>	'backup',
 				'label'			=>	'la_tab_Backup',
 				'url'			=>	Array ('t' => 'tools/backup1', 'section' => 'in-portal:configure_general', 'module' => 'In-Portal',  'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	2,
+				'priority'		=>	1,
 				'type'			=>	stTREE,
 			),
 
 			'in-portal:restore' => Array (
 				'parent'		=>	'in-portal:tools',
-				'icon'			=>	'tool_restore',
+				'icon'			=>	'restore',
 				'label'			=>	'la_tab_Restore',
 				'url'			=>	Array ('t' => 'tools/restore1', 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	3,
+				'priority'		=>	2,
 				'type'			=>	stTREE,
 			),
 
 			'in-portal:main_import' => Array (
 				'parent'		=>	'in-portal:tools',
-				'icon'			=>	'tool_import',
+				'icon'			=>	'import_data',
 				'label'			=>	'la_tab_ImportData',
 				'url'			=>	Array ('t' => 'tools/import1'),
 				'onclick'		=>	'direct_edit(\'adm\', this.href);',
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	4,
+				'priority'		=>	3,
 				'type'			=>	stTREE,
 			),
 
 			'in-portal:sql_query' => Array (
 				'parent'		=>	'in-portal:tools',
-				'icon'			=>	'tool_import',
+				'icon'			=>	'query_database',
 				'label'			=>	'la_tab_QueryDB',
 				'url'			=>	Array ('t' => 'tools/sql_query', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'edit'),
-				'priority'		=>	5,
+				'priority'		=>	4,
 				'type'			=>	stTREE,
 			),
 
@@ -239,7 +242,7 @@
 				'label'			=>	'la_tab_ServerInfo',
 				'url'			=>	Array ('t' => 'tools/server_info', 'pass' => 'm'),
 				'permissions'	=>	Array ('view'),
-				'priority'		=>	6,
+				'priority'		=>	5,
 				'type'			=>	stTREE,
 			),
 		),
Index: branches/5.1.x/core/units/stop_words/stop_words_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/stop_words/stop_words_config.php	(.../stop_words_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/stop_words/stop_words_config.php	(.../stop_words_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: stop_words_config.php 11902 2009-07-15 01:07:23Z dmitrya $
+* @version	$Id: stop_words_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'stop-word',
 		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -56,7 +58,7 @@
 		'Sections' => Array (
 			'in-portal:stop_words' => Array (
 				'parent'		=>	'in-portal:website_setting_folder',
-				'icon'			=>	'custom',
+				'icon'			=>	'conf_stopwords',
 				'label'			=>	'la_title_StopWords',
 				'url'			=>	Array('t' => 'stop_words/stop_word_list', 'pass' => 'm'),
 				'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
@@ -82,10 +84,14 @@
 
 		'Grids' => Array (
 			'Default' => Array (
-				'Icons' => Array ('default' => 'icon16_custom.gif'),
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					0 => 'icon16_disabled.png',
+					1 => 'icon16_item.png',
+				),
 				'Fields' => Array (
-					'StopWordId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
-					'StopWord' => Array ('title' => 'la_col_StopWord', 'filter_block' => 'grid_like_filter',),
+					'StopWordId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+					'StopWord' => Array ('title' => 'la_col_StopWord', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
 				),
 			),
 		),
Index: branches/5.1.x/core/admin_templates/regional/languages_edit.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/regional/languages_edit.tpl	(.../languages_edit.tpl)	(revision 12657)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="850" height="600"/>
+<inp2:adm_SetPopupSize width="950" height="700"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="languages_edit_general" tab_preset="Default"/>
Index: branches/5.1.x/core/kernel/nparser/template_cache.php
===================================================================
diff -u -N -r12323 -r12657
--- branches/5.1.x/core/kernel/nparser/template_cache.php	(.../5.0.x/core/kernel/nparser/template_cache.php)	(revision 12323)
+++ branches/5.1.x/core/kernel/nparser/template_cache.php	(.../5.1.x/core/kernel/nparser/template_cache.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: template_cache.php 12323 2009-08-17 20:39:30Z alex $
+* @version	$Id: template_cache.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_view_item.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 12657)
@@ -191,7 +191,7 @@
 
 			 	a_toolbar.AddButton(
 			 		new ToolBarButton(
-			 			'rebuild_cache',
+			 			'tools',
 			 			'<inp2:m_Phrase label="la_ToolTip_Tools" escape="1"/>',
 			 			function() {
 							var $menu = menuMgr.createMenu(rs('tools_menu'));
@@ -210,7 +210,7 @@
 
 							renderMenus();
 
-							nls_showMenu(rs('tools_menu'), a_toolbar.GetButtonImage('rebuild_cache'));
+							nls_showMenu(rs('tools_menu'), a_toolbar.GetButtonImage('tools'));
 						}
 					)
 				);
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_settings_general.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_reset_to_shipping_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 12657)
@@ -86,19 +86,17 @@
 	<inp2:m_if check="m_Param" name="not_last">; </inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" style="width: 100%">
+<inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" hint_label="" style="width: 100%">
 	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<td class="control-cell">
 				<inp2:m_if check="{$prefix}_IsManualRecipient">
 					<input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>">
 				<inp2:m_else/>
 					<inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
 					<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
 				</inp2:m_if>
-
-				<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 			</td>
 			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
 		</tr>
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_review_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/user_groups/user_groups_eh.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/user_groups/user_groups_eh.php	(.../user_groups_eh.php)	(revision 12127)
+++ branches/5.1.x/core/units/user_groups/user_groups_eh.php	(.../user_groups_eh.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_groups_eh.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: user_groups_eh.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -11,9 +11,11 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
-	
+
+	defined('FULL_PATH') or die('restricted access!');
+
 	class UserGroupsEventHandler extends kDBEventHandler {
-	
+
 		/**
 		 * Adds user as member for selected groups
 		 *
@@ -26,17 +28,17 @@
 			if (!$new_groups) {
 				return ;
 			}
-			
+
 			$new_groups = array_keys($new_groups);
-			
+
 			// don't insert duplicate group membership record
 			$user_id = $this->Application->GetVar('u_id');
 			$table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroup', 'prefix:u');
 			$sql = 'SELECT GroupId
 					FROM '.$table_name.'
-					WHERE PortalUserId = '.$user_id;
+					WHERE PortalUserId = '.(int)$user_id;
 			$old_groups = $this->Conn->GetCol($sql);
-			
+
 			$new_groups = array_diff($new_groups, $old_groups);
 			if ($new_groups) {
 				foreach ($new_groups as $new_group) {
@@ -54,17 +56,17 @@
 				if (!$new_users) {
 					return ;
 				}
-				
+
 				$new_users = array_keys($new_users);
-				
+
 				// don't insert duplicate group membership record
 				$group_id = $this->Application->GetVar('g_id');
 				$table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroup', 'prefix:g');
 				$sql = 'SELECT PortalUserId
-						FROM '.$table_name.'
-						WHERE GroupId = '.$group_id;
+						FROM ' . $table_name . '
+						WHERE GroupId = ' . (int)$group_id;
 				$old_users = $this->Conn->GetCol($sql);
-				
+
 				$new_users = array_diff($new_users, $old_users);
 				if ($new_users) {
 					foreach ($new_users as $new_user) {
@@ -77,11 +79,11 @@
 					}
 				}
 			}
-			
+
 			$this->Application->StoreVar($this->Application->GetTopmostPrefix($event->Prefix).'_modified', '1');
 			$event->SetRedirectParam('opener', 'u');
 		}
-		
+
 		/**
 		 * Sets primary group for user (in editing only)
 		 *
@@ -94,21 +96,21 @@
 				$id = array_shift($ids);
 				$object =& $event->getObject( Array('skip_autoload' => true) );
 				$user_id = $this->Application->GetVar('u_id');
-				
-				$sql = 'UPDATE '.$object->TableName.'
+
+				$sql = 'UPDATE ' . $object->TableName . '
 						SET PrimaryGroup = 0
-						WHERE PortalUserId = '.$user_id;
+						WHERE PortalUserId = ' . (int)$user_id;
 				$this->Conn->Query($sql);
-	
-				$sql = 'UPDATE '.$object->TableName.'
+
+				$sql = 'UPDATE ' . $object->TableName . '
 						SET PrimaryGroup = 1
-						WHERE '.$object->IDField.' = '.$id.' AND PortalUserId = '.$user_id;
+						WHERE ' . $object->IDField . ' = ' . $id . ' AND PortalUserId = ' . (int)$user_id;
 				$this->Conn->Query($sql);
 			}
-			
+
 			$this->clearSelectedIDs($event);
 		}
-		
+
 		/**
 		 * Don't allow primary group record deleting
 		 *
@@ -120,25 +122,24 @@
 				$ids = $event->getEventParam('ids');
 				if ($ids) {
 					$object =& $event->getObject( Array('skip_autoload' => true) );
-					
+
 					if ($event->Prefix == 'u-ug') {
 					$user_id = $this->Application->GetVar('u_id');
 					$sql = 'SELECT '.$object->IDField.'
 							FROM '.$object->TableName.'
-							WHERE '.$object->IDField.' IN ('.implode(',', $ids).') AND PortalUserId = '.$user_id.' AND PrimaryGroup = 0';
+							WHERE '.$object->IDField.' IN ('.implode(',', $ids).') AND PortalUserId = '.(int)$user_id.' AND PrimaryGroup = 0';
 					$ids = $this->Conn->GetCol($sql);
 					}
 					elseif ($event->Prefix == 'g-ug') {
 						$group_id = $this->Application->GetVar('g_id');
 						$sql = 'SELECT '.$object->IDField.'
 								FROM '.$object->TableName.'
-								WHERE '.$object->IDField.' IN ('.implode(',', $ids).') AND GroupId = '.$group_id.' AND PrimaryGroup = 0';
+								WHERE '.$object->IDField.' IN ('.implode(',', $ids).') AND GroupId = '.(int)$group_id.' AND PrimaryGroup = 0';
 						$ids = $this->Conn->GetCol($sql);
 					}
 					$event->setEventParam('ids', $ids);
 				}
 			}
 		}
-	}
 
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_struct.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_spelling_dictionary.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_currency_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_conf_regional.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_import_language_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/languages/languages_item.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/languages/languages_item.php	(.../languages_item.php)	(revision 12127)
+++ branches/5.1.x/core/units/languages/languages_item.php	(.../languages_item.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_item.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: languages_item.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class LanguagesItem extends kDBItem
 	{
 		function generateID()
@@ -86,6 +88,4 @@
 			}
 			return $res;
 		}
-	}
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_tag_processor.php 11913 2009-07-19 10:49:16Z alex $
+* @version	$Id: db_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,8 +12,10 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-class kDBTagProcessor extends TagProcessor {
+defined('FULL_PATH') or die('restricted access!');
 
+class kDBTagProcessor extends kTagProcessor {
+
 	/**
 	* Description
 	*
@@ -360,14 +362,15 @@
 	 */
 	function getUniqueListKey($params)
 	{
-		$types = $this->SelectParam($params, 'types');
-		$except = $this->SelectParam($params, 'except');
-		$list_name = $this->SelectParam($params, 'list_name');
+		$types = array_key_exists('types', $params) ? $params['types'] : '';
+		$except = array_key_exists('except', $params) ? $params['except'] : '';
+		$list_name = array_key_exists('list_name', $params) ? $params['list_name'] : '';
+
 		if (!$list_name) {
 			$list_name = $this->Application->Parser->GetParam('list_name');
 		}
 
-		return $types.$except.$list_name;
+		return $types . $except . $list_name;
 	}
 
 	/**
@@ -384,38 +387,39 @@
 		}
 
 		$requery = isset($params['requery']) && $params['requery'];
-		if ($list_name && !$requery){
+		if ($list_name && !$requery) {
 			$names_mapping = $this->Application->GetVar('NamesToSpecialMapping');
 
 			$special = is_array($names_mapping) && isset($names_mapping[$this->Prefix]) && isset($names_mapping[$this->Prefix][$list_name]) ? $names_mapping[$this->Prefix][$list_name] : false;
 //			$special = getArrayValue($names_mapping, $this->Prefix, $list_name);
-			if(!$special)
-			{
+			if (!$special) {
 				$special = $this->BuildListSpecial($params);
 			}
 		}
-		else
-		{
+		else {
 			$special = $this->BuildListSpecial($params);
 		}
 
 		$prefix_special = rtrim($this->Prefix.'.'.$special, '.');
 		$params['skip_counting'] = true;
+
 		$list =& $this->Application->recallObject( $prefix_special, $this->Prefix.'_List', $params);
 		/* @var $list kDBList */
 
-		if ($requery) {
-			$this->Application->HandleEvent($an_event, $prefix_special.':OnListBuild', $params);
-		}
+		if (!array_key_exists('skip_quering', $params) || !$params['skip_quering']) {
+			if ($requery) {
+				$this->Application->HandleEvent($an_event, $prefix_special.':OnListBuild', $params);
+			}
 
-		if (array_key_exists('offset', $params)) {
-			$list->Offset += $params['offset']; // apply custom offset
-		}
+			if (array_key_exists('offset', $params)) {
+				$list->Offset += $params['offset']; // apply custom offset
+			}
 
-		$list->Query($requery);
+			$list->Query($requery);
 
-		if (array_key_exists('offset', $params)) {
-			$list->Offset -= $params['offset']; // remove custom offset
+			if (array_key_exists('offset', $params)) {
+				$list->Offset -= $params['offset']; // remove custom offset
+			}
 		}
 
 		$this->Special = $special;
@@ -432,7 +436,11 @@
 	{
 		$list =& $this->GetList($params);
 		$ret = $list->getPrefixSpecial();
-		if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
+
+		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
+			$ret = preg_quote($ret, '/');
+		}
+
 		return $ret;
 	}
 
@@ -647,6 +655,7 @@
 	function ColumnWidth($params)
 	{
 		$columns = $this->Application->Parser->GetParam('columns');
+
 		return round(100/$columns).'%';
 	}
 
@@ -726,68 +735,72 @@
 
 		$object =& $this->getObject($params);
 
-		if ( $this->HasParam($params, 'db')  )
-		{
+		if (array_key_exists('db', $params) && $params['db']) {
 			$value = $object->GetDBField($field);
 		}
-		else
-		{
-			if( $this->HasParam($params, 'currency') )
-			{
+		else {
+			if (array_key_exists('currency', $params) && $params['currency']) {
 				$iso = $this->GetISO($params['currency']);
 				$original = $object->GetDBField($field);
 				$value = $this->ConvertCurrency($original, $iso);
 				$object->SetDBField($field, $value);
 				$object->Fields[$field]['converted'] = true;
 			}
 
-			$format = getArrayValue($params, 'format');
+			$format = array_key_exists('format', $params) ? $params['format'] : false;
 			if (!$format || $format == '$format') {
 				$format = null;
 			}
 
 			$value = $object->GetField($field, $format);
 
-			if( $this->SelectParam($params, 'negative') )
-			{
-				if(strpos($value, '-') === 0)
-				{
+			if (array_key_exists('negative', $params) && $params['negative']) {
+				if (strpos($value, '-') === 0) {
 					$value = substr($value, 1);
 				}
-				else
-				{
-					$value = '-'.$value;
+				else {
+					$value = '-' . $value;
 				}
 			}
 
-			if( $this->HasParam($params, 'currency') )
-			{
+			if (array_key_exists('currency', $params) && $params['currency']) {
 				$value = $this->AddCurrencySymbol($value, $iso);
 				$params['no_special'] = 1;
 			}
 		}
 
-		if( !$this->HasParam($params, 'no_special') ) $value = htmlspecialchars($value);
-		if( getArrayValue($params,'checked'	) ) $value = ($value == ( isset($params['value']) ? $params['value'] : 1)) ? 'checked' : '';
-		if( isset($params['plus_or_as_label']) ) {
+		if (!array_key_exists('no_special', $params) || !$params['no_special']) {
+			$value = htmlspecialchars($value);
+		}
+
+		if (array_key_exists('checked', $params) && $params['checked']) {
+			$value = ($value == ( isset($params['value']) ? $params['value'] : 1)) ? 'checked' : '';
+		}
+
+		if (array_key_exists('plus_or_as_label', $params) && $params['plus_or_as_label']) {
 			$value = substr($value, 0,1) == '+' ? substr($value, 1) : $this->Application->Phrase($value);
 		}
-		elseif( isset($params['as_label']) && $params['as_label']  ) $value = $this->Application->Phrase($value);
+		elseif (array_key_exists('as_label', $params) && $params['as_label']) {
+			$value = $this->Application->Phrase($value);
+		}
 
 		$first_chars = $this->SelectParam($params,'first_chars,cut_first');
-		if($first_chars)
-		{
+		if ($first_chars) {
 			$needs_cut = mb_strlen($value) > $first_chars;
 			$value = mb_substr($value, 0, $first_chars);
 			if ($needs_cut) $value .= ' ...';
 		}
-		if( getArrayValue($params,'nl2br'	) ) $value = nl2br($value);
 
-		if ($value != '') $this->Application->Parser->DataExists = true;
+		if (array_key_exists('nl2br', $params) && $params['nl2br']) {
+			$value = nl2br($value);
+		}
 
-		if( $this->HasParam($params, 'currency') )
-		{
-			//restoring value in original currency, for other Field tags to work properly
+		if ($value != '') {
+			$this->Application->Parser->DataExists = true;
+		}
+
+		if (array_key_exists('currency', $params) && $params['currency']) {
+			// restoring value in original currency, for other Field tags to work properly
 			$object->SetDBField($field, $original);
 		}
 
@@ -806,25 +819,6 @@
 		$object->SetDBField($dst_field, $src_object->GetDBField($src_field));
 	}
 
-	/**
-	 * Checks if parameter is passed
-	 * Note: works like Tag and line simple method too
-	 *
-	 * @param Array $params
-	 * @param string $param_name
-	 * @return bool
-	 */
-	function HasParam($params, $param_name = null)
-	{
-		if( !isset($param_name) )
-		{
-			$param_name = $this->SelectParam($params, 'name');
-			$params = $this->Application->Parser->Params;
-		}
-		$value = isset($params[$param_name]) ? $params[$param_name] : false;
-		return $value && ($value != '$'.$param_name);
-	}
-
 	function PhraseField($params)
 	{
 		$field_label = $this->Field($params);
@@ -846,7 +840,7 @@
 		{
 			$object =& $this->getObject($params);
 
-			$skip_fields = getArrayValue($params, 'except');
+			$skip_fields = array_key_exists('except', $params) ? $params['except'] : false;
 			$skip_fields = $skip_fields ? explode(',', $skip_fields) : Array();
 
 			return $object->HasErrors($skip_fields);
@@ -889,7 +883,8 @@
 		}
 
 		$options = $object->GetFieldOptions($field);
-		return getArrayValue($options,'required');
+
+		return array_key_exists('required', $options) ? $options['required'] : false;
 	}
 
 	function FieldOption($params)
@@ -915,7 +910,7 @@
 
 		$options = $field_options['options'];
 
-		if ($this->HasParam($params, 'has_empty')) {
+		if (array_key_exists('has_empty', $params) && $params['has_empty']) {
 			$empty_value = array_key_exists('empty_value', $params) ? $params['empty_value'] : '';
 			$options = array_merge_recursive2(Array ($empty_value => ''), $options); // don't use other array merge function, because they will reset keys !!!
 		}
@@ -931,14 +926,14 @@
 			$block_params['field_name'] = $this->InputName($params); // depricated (produces warning when used as grid filter), but used in Front-End (submission create), admin (submission view)
 		}
 
-		$selected_param_name = getArrayValue($params, 'selected_param');
+		$selected_param_name = array_key_exists('selected_param', $params) ? $params['selected_param'] : false;
 		if (!$selected_param_name) {
 			$selected_param_name = $params['selected'];
 		}
 		$selected = $params['selected'];
 
 		$o = '';
-		if ($this->HasParam($params, 'no_empty') && !getArrayValue($options, '')) {
+		if (array_key_exists('no_empty', $params) && $params['no_empty'] && !getArrayValue($options, '')) {
 			// removes empty option, when present (needed?)
 			array_shift($options);
 		}
@@ -967,7 +962,7 @@
 
 	function PredefinedSearchOptions($params)
 	{
-		$object =& $this->getObject($params);
+		$object =& $this->GetList($params);
 		/* @var $object kDBList */
 
 		$params['value'] = $this->SearchField($params);
@@ -984,18 +979,17 @@
 
 		$format = $options[ $this->SelectParam($params, 'input_format') ? 'input_format' : 'format' ];
 
-		$formatter_class = getArrayValue($options,'formatter');
+		$formatter_class = array_key_exists('formatter', $options) ? $options['formatter'] : false;
+
 		if ($formatter_class) {
 			$formatter =& $this->Application->recallObject($formatter_class);
-			$human_format = getArrayValue($params,'human');
-			$edit_size = getArrayValue($params,'edit_size');
-			$sample = getArrayValue($params,'sample');
-			if($sample)
-			{
+			$human_format = array_key_exists('human', $params) ? $params['human'] : false;
+			$edit_size = array_key_exists('edit_size', $params) ? $params['edit_size'] : false;
+			$sample = array_key_exists('sample', $params) ? $params['sample'] : false;
+			if ($sample) {
 				return $formatter->GetSample($field, $options, $object);
 			}
-			elseif($human_format || $edit_size)
-			{
+			elseif ($human_format || $edit_size) {
 				$format = $formatter->HumanFormat($format);
 				return $edit_size ? strlen($format) : $format;
 			}
@@ -1204,7 +1198,7 @@
 			$id = $params['force_id'];
 		}
 		else {
-			$id_field = getArrayValue($params, 'IdField');
+			$id_field = array_key_exists('IdField', $params) ? $params['IdField'] : false;
 			$id = $id_field ? $object->GetDBField($id_field) : $object->GetID();
 		}
 
@@ -1226,7 +1220,11 @@
 		list($id, $field) = $this->prepareInputName($params);
 
 		$ret = $this->getPrefixSpecial().'['.$id.']['.$field.']';
-		if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
+
+		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
+			$ret = preg_quote($ret, '/');
+		}
+
 		return $ret;
 	}
 
@@ -1243,8 +1241,11 @@
 		list($id, $field) = $this->prepareInputName($params);
 
 		$ret = 'field_modifiers['.$this->getPrefixSpecial().']['.$field.']['.$params['type'].']';
-		if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
 
+		if (array_key_exists('as_preg', $params) && $params['as_preg']) {
+			$ret = preg_quote($ret, '/');
+		}
+
 		if (isset($params['value'])) {
 			$object =& $this->getObject($params);
 			$field_modifiers[$field][$params['type']] = $params['value'];
@@ -1480,9 +1481,8 @@
 	function FieldEquals($params)
 	{
 		$object =& $this->getObject($params);
-		$ret = $object->GetDBField($this->SelectParam($params, 'name,field')) == $params['value'];
-//		if( getArrayValue($params,'inverse') ) $ret = !$ret;
-		return $ret;
+
+		return $object->GetDBField( $this->SelectParam($params, 'name,field') ) == $params['value'];
 	}
 
 	/**
@@ -1532,23 +1532,38 @@
 
 	function ItemIcon($params)
 	{
-		$object =& $this->getObject($params);
+		$grids = $this->Application->getUnitOption($this->Prefix, 'Grids');
+		$grid = $grids[ $params['grid'] ];
 
-		$grids = $this->Application->getUnitOption($this->Prefix,'Grids');
-		$icons =& $grids[ $params['grid'] ]['Icons'];
+		if (!array_key_exists('Icons', $grid)) {
+			return '';
+		}
 
-		$key = '';
-		$status_fields = $this->Application->getUnitOption($this->Prefix,'StatusField');
-		if(!$status_fields) return $icons['default'];
+		$icons = $grid['Icons'];
 
-		foreach($status_fields as $status_field)
-		{
-			$key .= $object->GetDBField($status_field).'_';
+		if (array_key_exists('name', $params)) {
+			$icon_name = $params['name'];
+			return array_key_exists($icon_name, $icons) ? $icons[$icon_name] : '';
 		}
-		$key = rtrim($key,'_');
-		$value = ($key !== false) ? $key : 'default';
 
-		return isset($icons[$value]) ? $icons[$value] : $icons['default'];
+		$status_fields = $this->Application->getUnitOption($this->Prefix, 'StatusField');
+
+		if (!$status_fields) {
+			return $icons['default'];
+		}
+
+		$object =& $this->getObject($params);
+		/* @var $object kDBList */
+
+		$icon = '';
+
+		foreach ($status_fields as $status_field) {
+			$icon .= $object->GetDBField($status_field) . '_';
+		}
+
+		$icon = rtrim($icon, '_');
+
+		return array_key_exists($icon, $icons) ? $icons[$icon] : $icons['default'];
 	}
 
 	/**
@@ -1561,7 +1576,8 @@
 	{
 		$preset_name = replaceModuleSection($params['title_preset']);
 		$title_presets = $this->Application->getUnitOption($this->Prefix,'TitlePresets');
-		$title_info = getArrayValue($title_presets, $preset_name);
+		$title_info = array_key_exists($preset_name, $title_presets) ? $title_presets[$preset_name] : false;
+
 		if ($title_info === false) {
 			$title = str_replace('#preset_name#', $preset_name, $params['title']);
 			if ($this->Application->ConfigValue('UseSmallHeader') && isset($params['group_title']) && $params['group_title']) {
@@ -1570,7 +1586,7 @@
 			return $title;
 		}
 
-		if (getArrayValue($title_presets,'default')) {
+		if (array_key_exists('default', $title_presets) && $title_presets['default']) {
 			// use default labels + custom labels specified in preset used
 			$title_info = array_merge_recursive2($title_presets['default'], $title_info);
 		}
@@ -1582,8 +1598,9 @@
 		$object_status = Array();
 		$status_labels = Array();
 
-		$prefixes = getArrayValue($title_info,'prefixes');
-		$all_tag_params = getArrayValue($title_info,'tag_params');
+		$prefixes = array_key_exists('prefixes', $title_info) ? $title_info['prefixes'] : false;
+		$all_tag_params = array_key_exists('tag_params', $title_info) ? $title_info['tag_params'] : false;
+
 		if ($prefixes) {
 			// extract tag_perams passed directly to SectionTitle tag for specific prefix
 			foreach ($params as $tp_name => $tp_value) {
@@ -1600,7 +1617,9 @@
 
 				if ($all_tag_params) {
 					$tag_params = getArrayValue($all_tag_params, $prefix_data['prefix_special']);
-					if (!$tag_params) $tag_params = Array();
+					if (!$tag_params) {
+						$tag_params = Array();
+					}
 				}
 
 				$tag_params = array_merge_recursive2($params, $tag_params);
@@ -1654,7 +1673,8 @@
 			$title .= ' - '.$params['group_title'];
 		}
 
-		$cut_first = getArrayValue($params, 'cut_first');
+		$cut_first = array_key_exists('cut_first', $params) && $params['cut_first'];
+
 		if ($cut_first && mb_strlen($title) > $cut_first) {
 			if (!preg_match('/<a href="(.*)">(.*)<\/a>/',$title)) {
 				$title = mb_substr($title, 0, $cut_first).' ...';
@@ -1824,8 +1844,8 @@
 	 */
 	function SaveWarning($params)
 	{
-		$main_prefix = getArrayValue($params, 'main_prefix');
-		if ($main_prefix && $main_prefix != '$main_prefix') {
+		$main_prefix = array_key_exists('main_prefix', $params) ? $params['main_prefix'] : false;
+		if ($main_prefix) {
 			$top_prefix = $main_prefix;
 		}
 		else {
@@ -1897,35 +1917,55 @@
 				$ret = $ret[ $params['type'] ];
 			}
 
-			if( !$this->HasParam($params, 'no_special') ) $ret = htmlspecialchars($ret);
+			if (!array_key_exists('no_special', $params) || !$params['no_special']) {
+				$ret = htmlspecialchars($ret);
+			}
+
 			return $ret;
 		}
 
 		return '';
 	}
 
+	/**
+	 * Tells, that at least one of search filters is used by now
+	 *
+	 * @param Array $params
+	 * @return bool
+	 */
+	function SearchActive($params)
+	{
+		if ($this->Application->RecallVar($this->getPrefixSpecial() . '_search_keyword')) {
+			// simple search filter is used
+			return true;
+		}
+
+		$view_name = $this->Application->RecallVar($this->getPrefixSpecial().'_current_view');
+		$custom_filter = $this->Application->RecallPersistentVar($this->getPrefixSpecial().'_custom_filter.'.$view_name/*, ALLOW_DEFAULT_SETTINGS*/);
+		$custom_filter = $custom_filter ? unserialize($custom_filter) : Array();
+
+		return array_key_exists($params['grid'], $custom_filter);
+	}
+
 	function SearchFormat($params)
 	{
 		$field = $params['field'];
 		$object =& $this->GetList($params);
 
 		$options = $object->GetFieldOptions($field);
-
 		$format = $options[ $this->SelectParam($params, 'input_format') ? 'input_format' : 'format' ];
+		$formatter_class = array_key_exists('formatter', $options) ? $options['formatter'] : false;
 
-		$formatter_class = getArrayValue($options,'formatter');
-		if($formatter_class)
-		{
+		if ($formatter_class) {
 			$formatter =& $this->Application->recallObject($formatter_class);
-			$human_format = getArrayValue($params,'human');
-			$edit_size = getArrayValue($params,'edit_size');
-			$sample = getArrayValue($params,'sample');
-			if($sample)
-			{
+			$human_format = array_key_exists('human', $params) ? $params['human'] : false;
+			$edit_size = array_key_exists('edit_size', $params) ? $params['edit_size'] : false;
+			$sample = array_key_exists('sample', $params) ? $params['sample'] : false;
+
+			if ($sample) {
 				return $formatter->GetSample($field, $options, $object);
 			}
-			elseif($human_format || $edit_size)
-			{
+			elseif ($human_format || $edit_size) {
 				$format = $formatter->HumanFormat($format);
 				return $edit_size ? strlen($format) : $format;
 			}
@@ -1958,38 +1998,6 @@
 	}
 
 	/**
-	 * Returns templates path for module, which is gathered from prefix module
-	 *
-	 * @param Array $params
-	 * @return string
-	 * @author Alex
-	 */
-	function ModulePath($params)
-	{
-		$force_module = getArrayValue($params, 'module');
-		if ($force_module) {
-			if ($force_module == '#session#') {
-				$force_module = preg_replace('/([^:]*):.*/', '\1', $this->Application->RecallVar('module'));
-				if (!$force_module) $force_module = 'core';
-			}
-			else {
-				$force_module = mb_strtolower($force_module);
-			}
-
-			if ($force_module == 'core') {
-				$module_folder = 'core';
-			}
-			else {
-				$module_folder = trim( $this->Application->findModule('Name', $force_module, 'Path'), '/');
-			}
-		}
-		else {
-			$module_folder = $this->Application->getUnitOption($this->Prefix, 'ModuleFolder');
-		}
-		return '../../'.$module_folder.'/admin_templates/';
-	}
-
-	/**
 	 * Returns object used in tag processor
 	 *
 	 * @access public
@@ -2043,7 +2051,7 @@
 		return false;
 	}
 
-	function MultipleEditing($params)
+	/*function MultipleEditing($params)
 	{
 		$wid = $this->Application->GetTopmostWid($this->Prefix);
 		$session_name = rtrim($this->getPrefixSpecial().'_selected_ids_'.$wid, '_');
@@ -2061,7 +2069,7 @@
 		}
 
 		return $ret;
-	}
+	}*/
 
 	/**
 	 * Returns import/export process percent
@@ -2108,8 +2116,7 @@
 	{
 		$ret = EXPORT_PATH.'/';
 
-		if( getArrayValue($params, 'as_url') )
-		{
+		if (array_key_exists('as_url', $params) && $params['as_url']) {
 			$ret = str_replace( FULL_PATH.'/', $this->Application->BaseURL(), $ret);
 		}
 
@@ -2187,10 +2194,10 @@
 			// editing content block from Front-End, not category in admin
 			$sql = 'SELECT NamedParentPath
 					FROM ' . $this->Application->getUnitOption('c', 'TableName') . '
-					WHERE ' . $this->Application->getUnitOption('c', 'IDField') . ' = ' . $page_id;
+					WHERE ' . $this->Application->getUnitOption('c', 'IDField') . ' = ' . (int)$page_id;
 			$template = strtolower( $this->Conn->GetOne($sql) );
 
-			$url_params = Array ('m_cat_id' => $page_id, 'no_amp' => 1, 'editing_mode' => EDITING_MODE_CMS, 'pass' => 'm');
+			$url_params = Array ('m_cat_id' => $page_id, 'no_amp' => 1, 'editing_mode' => EDITING_MODE_CONTENT, 'pass' => 'm');
 			$preview_url = $this->Application->HREF($template, '_FRONT_END_', $url_params, 'index.php');
 			$preview_url = preg_replace('/&(admin|editing_mode)=[\d]/', '', $preview_url);
 		}
@@ -2538,6 +2545,4 @@
 
 		return false;
 	}
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_reset_to_shipping.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/regional/languages_edit_phrases.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/regional/languages_edit_phrases.tpl	(.../languages_edit_phrases.tpl)	(revision 12657)
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="850" height="600"/>
+<inp2:adm_SetPopupSize width="950" height="700"/>
 
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="phrases_list" tab_preset="Default" pagination="1" pagination_prefix="phrases"/>
@@ -38,7 +38,7 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				a_toolbar.AddButton( new ToolBarButton('new_language_var', '<inp2:m_phrase label="la_ToolTip_NewLabel" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewLabel" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
 						function() {
 							std_new_item('phrases', 'regional/phrases_edit')
 						} ) );
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_sessions_log.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_email_log.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/images/image_tag_processor.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/images/image_tag_processor.php	(.../image_tag_processor.php)	(revision 12127)
+++ branches/5.1.x/core/units/images/image_tag_processor.php	(.../image_tag_processor.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: image_tag_processor.php 11939 2009-07-20 18:08:55Z alex $
+* @version	$Id: image_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+
+
 class ImageTagProcessor extends kDBTagProcessor {
 
 	/**
@@ -422,6 +424,4 @@
 
 		return parent::SaveWarning($params);
 	}
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/users/admins_edit_groups.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/users/admins_edit_groups.tpl	(.../admins_edit_groups.tpl)	(revision 12657)
@@ -39,7 +39,7 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				a_toolbar.AddButton( new ToolBarButton('usertogroup', '<inp2:m_phrase label="la_ToolTip_AddToGroup" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('select_user', '<inp2:m_phrase label="la_ToolTip_AddToGroup" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							openSelector('u-ug', '<inp2:m_Link t="users/group_selector" pass="m,u"/>', 'GroupId', '800x600');
 						} ) );
@@ -50,7 +50,7 @@
 							std_delete_items('u-ug');
 						} ) );
 
-				a_toolbar.AddButton( new ToolBarButton('primary_group', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>',
 						function() {
 							submit_event('u-ug','OnSetPrimary');
 						} ) );
@@ -95,7 +95,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="u-ug" IdField="GroupId" grid="Default" limited_heights="1"/>
 <script type="text/javascript">
-	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'edit', 'primary_group') );
+	Grids['u-ug'].SetDependantToolbarButtons( new Array('delete', 'edit', 'setprimary') );
 </script>
 
 <input type="hidden" name="u_mode" value="t<inp2:m_Get var="m_wid" />" />
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_tool_restore.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_community.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_paymenttype_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/globals.php
===================================================================
diff -u -N -r12453 -r12657
--- branches/5.1.x/core/kernel/globals.php	(.../globals.php)	(revision 12453)
+++ branches/5.1.x/core/kernel/globals.php	(.../globals.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: globals.php 12453 2009-09-05 14:11:39Z alex $
+* @version	$Id: globals.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -11,8 +11,10 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
-	if( !function_exists('array_merge_recursive2') )
-	{
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	if( !function_exists('array_merge_recursive2') ) {
 		/**
 		 * array_merge_recursive2()
 		 *
@@ -494,7 +496,7 @@
 		}
 
 		$line = $enclosure.implode($enclosure.$delimiter.$enclosure, $data).$enclosure.$recordSeparator;
-		$line = preg_replace('/'.preg_quote($enclosure).'([0-9\.]+)'.preg_quote($enclosure).'/', '$1', $line);
+		$line = preg_replace('/'.preg_quote($enclosure, '/').'([0-9\.]+)'.preg_quote($enclosure, '/').'/', '$1', $line);
 		fwrite($filePointer, $line);
 	}
 
@@ -514,7 +516,7 @@
 			$data[$field_index] = str_replace($enclosure, $enclosure.$enclosure, $field_value);
 		}
 		$line = $enclosure.implode($enclosure.$delimiter.$enclosure, $data).$enclosure.$recordSeparator;
-		$line = preg_replace('/'.preg_quote($enclosure).'([0-9\.]+)'.preg_quote($enclosure).'/', '$1', $line);
+		$line = preg_replace('/'.preg_quote($enclosure, '/').'([0-9\.]+)'.preg_quote($enclosure, '/').'/', '$1', $line);
 		return $line;
 	}
 	/**
@@ -618,18 +620,6 @@
 		return $headers;
 	}
 
-	/**
-	 * Checks that file is writable by group or others
-	 *
-	 * @param string $file
-	 * @return boolean
-	 */
-	function check_write_permissions($file)
-	{
-		$permissions = fileperms($file);
-		return $permissions & 0x0010 || $permissions & 0x0002;
-	}
-
 	if (!function_exists('easter_date')) {
 		// calculates easter date, when calendar extension not installed in php
 		// see also: http://php.prod.intechnic.lv/manual/en/function.easter-date.php
@@ -749,5 +739,4 @@
 
 			return $res;
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: unit_config_reader.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class kUnitConfigReader extends kBase {
 
 	/**
@@ -56,9 +58,11 @@
 	{
 		parent::Init($prefix,$special);
 
-		$this->_directorySeparator = preg_quote(DIRECTORY_SEPARATOR);
+		$this->_directorySeparator = preg_quote( DIRECTORY_SEPARATOR );
 		$this->_skipFolders[] = trim(WRITEBALE_BASE, '/'); // system folder (where web server can write)
-		$this->_skipFolders[] = array_pop( explode('/', trim(EDITOR_PATH, '/')) ); // last of cmseditor folders
+
+		$editor_path = explode('/', trim(EDITOR_PATH, '/'));
+		$this->_skipFolders[] = array_pop($editor_path); // last of cmseditor folders
 	}
 
 	function CacheParsedData()
@@ -69,7 +73,8 @@
 		$config_vars = Array (
 			'SessionTimeout',
 			'SessionCookieName',
-			'SessionReferrerCheck',
+			'SessionBrowserSignatureCheck',
+			'SessionIPAddressCheck',
 			'CookieSessions',
 			'UseCronForRegularEvent',
 			'User_GuestGroup',
@@ -82,6 +87,7 @@
 			'Config_Server_Time',
 			'Config_Site_Time',
 			'UseChangeLog',
+			'UseVisitorTracking',
 		);
 
 		foreach ($config_vars as $var) {
@@ -105,6 +111,7 @@
 		'Application.ConfigCacheIds' => $this->Application->ConfigCacheIds,
 		'Application.ConfigHash' => $this->Application->ConfigHash,
 		'Application.ReplacementTemplates' => $this->Application->ReplacementTemplates,
+		'Application.RewriteListeners' => $this->Application->RewriteListeners,
 		'Application.ModuleInfo' => $this->Application->ModuleInfo,
 		);
 
@@ -153,6 +160,7 @@
 			$this->Application->ConfigCacheIds = $cache['Application.ConfigCacheIds'];
 
 			$this->Application->ReplacementTemplates = $cache['Application.ReplacementTemplates'];
+			$this->Application->RewriteListeners = $cache['Application.RewriteListeners'];
 
 			$this->Application->ModuleInfo = $cache['Application.ModuleInfo'];
 
@@ -216,6 +224,9 @@
 
 		$base_folder = FULL_PATH . $folderPath . DIRECTORY_SEPARATOR;
 		$sub_folders = glob($base_folder . '*', GLOB_ONLYDIR);
+		if (!$sub_folders) {
+			return ;
+		}
 
 		if ($level == 0) {
 			// don't scan Front-End themes because of extensive directory structure
@@ -234,8 +245,10 @@
 				continue;
 			}
 
-			if (file_exists(FULL_PATH . $this->getConfigName($folderPath . DIRECTORY_SEPARATOR . $sub_folder))) {
-				$this->configFiles[] = $this->getConfigName($folderPath . DIRECTORY_SEPARATOR . $sub_folder);
+			$config_name = $this->getConfigName($folderPath . DIRECTORY_SEPARATOR . $sub_folder);
+
+			if (file_exists(FULL_PATH . $config_name)) {
+				$this->configFiles[] = $config_name;
 			}
 
 			$this->findConfigFiles($full_path, $level + 1);
@@ -254,27 +267,22 @@
 
 		$conn =& $this->Application->GetADODBConnection();
 		if (!isset($this->Application->Memcached) || !($data = $this->Application->Memcached->get('master:config_files'))) {
-			$data = $conn->GetOne('SELECT Data FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"');
+			$data = $conn->GetOne('SELECT Data FROM ' . TABLE_PREFIX . 'Cache WHERE VarName = "config_files"');
 		}
+
 		if ($cache && $data) {
 			$this->configFiles = unserialize($data);
 			shuffle($this->configFiles);
 		}
 		else {
-			$old_kernel_path = FULL_PATH . DIRECTORY_SEPARATOR . 'kernel' . DIRECTORY_SEPARATOR . 'kernel4';
-			if (file_exists($old_kernel_path)) {
-				// when we got both kernel (one from "kernel/kernel4" and other from "core/kernel") version after upgrade
-				die('Please remove "' . $old_kernel_path . '" folder.');
-			}
-
 			$this->findConfigFiles($folderPath); // search from base directory
 		}
 
 		foreach ($this->configFiles as $filename)
 		{
 			$prefix = $this->PreloadConfigFile($filename);
 			if (!$prefix) {
-				trigger_error('Prefix not defined in config file '.$filename, E_USER_ERROR);
+				trigger_error('Prefix not defined in config file ' . $filename, E_USER_ERROR);
 			}
 		}
 	}
@@ -333,12 +341,14 @@
 		if ($store_cache || (defined('IS_INSTALL') && IS_INSTALL)) {
 			// cache is not stored during install, but dynamic clones should be processed in any case
 			$this->processDynamicClones();
+			$this->retrieveCollections();
 		}
 
 		if ($store_cache) {
+			$this->_sortRewriteListeners();
 			$this->CacheParsedData();
 
-			if ($this->Application->isDebugMode(false) && constOn('DBG_VALIDATE_CONFIGS')) {
+			if (defined('DEBUG_MODE') && DEBUG_MODE && defined('DBG_VALIDATE_CONFIGS') && DBG_VALIDATE_CONFIGS) {
 				// validate configs here to have changes from OnAfterConfigRead hooks to prefixes
 				foreach ($this->configData as $prefix => $config) {
 					if (!isset($config['TableName'])) continue;
@@ -352,6 +362,34 @@
 	}
 
 	/**
+	 * Sort rewrite listeners according to RewritePriority (non-prioritized listeners goes first)
+	 *
+	 */
+	function _sortRewriteListeners()
+	{
+		$listeners = Array ();
+		$prioritized_listeners = Array ();
+
+		// process non-prioritized listeners
+		foreach ($this->Application->RewriteListeners as $prefix => $listener_data) {
+			if ($listener_data['priority'] === false) {
+				$listeners[$prefix] = $listener_data;
+			}
+			else {
+				$prioritized_listeners[$prefix] = $listener_data['priority'];
+			}
+		}
+
+		// process prioritized listeners
+		asort($prioritized_listeners);
+		foreach ($prioritized_listeners as $prefix => $priority) {
+			$listeners[$prefix] = $this->Application->RewriteListeners[$prefix];
+		}
+
+		$this->Application->RewriteListeners = $listeners;
+	}
+
+	/**
 	 * Re-reads all configs
 	 *
 	 */
@@ -376,6 +414,7 @@
 		$this->ParseConfigs();
 		$this->AfterConfigRead(false);
 		$this->processDynamicClones();
+		$this->retrieveCollections();
 	}
 
 	/**
@@ -405,6 +444,32 @@
 	}
 
 	/**
+	 * Process all collectable unit config options here to also catch ones, defined from OnAfterConfigRead events
+	 *
+	 */
+	function retrieveCollections()
+	{
+		foreach ($this->configData as $prefix => $config) {
+			// collect replacement templates
+			if (array_key_exists('ReplacementTemplates', $config) && $config['ReplacementTemplates']) {
+				$this->Application->ReplacementTemplates = array_merge($this->Application->ReplacementTemplates, $config['ReplacementTemplates']);
+			}
+
+			// collect rewrite listeners
+			if (array_key_exists('RewriteListener', $config) && $config['RewriteListener']) {
+				$rewrite_listener = $config['RewriteListener'];
+				if (strpos($rewrite_listener, ':') === false) {
+					$rewrite_listener = $prefix . '_EventHandler:' . $rewrite_listener;
+				}
+
+				$rewrite_priority = array_key_exists('RewritePriority', $config) ? $config['RewritePriority'] : false;
+
+				$this->Application->RewriteListeners[$prefix] = Array ('listener' => $rewrite_listener, 'priority' => $rewrite_priority);
+			}
+		}
+	}
+
+	/**
 	 * Register nessasary classes
 	 * This method should only process the data which is cached!
 	 *
@@ -415,6 +480,7 @@
 	{
 		$config =& $this->configData[$prefix];
 		$event_manager =& $this->Application->recallObject('EventManager');
+		/* @var $event_manager kEventManager */
 
 		$register_classes = getArrayValue($config,'RegisterClasses');
 		if (!$register_classes) $register_classes = Array();
@@ -451,11 +517,10 @@
 		}
 
 		$regular_events = getArrayValue($config, 'RegularEvents');
-		if($regular_events)
-		{
-			foreach($regular_events as $short_name => $regular_event_info)
-			{
-				$event_manager->registerRegularEvent( $short_name, $config['Prefix'].':'.$regular_event_info['EventName'], $regular_event_info['RunInterval'], $regular_event_info['Type'] );
+		if ($regular_events) {
+			foreach ($regular_events as $short_name => $regular_event_info) {
+				$event_status = array_key_exists('Status', $regular_event_info) ? $regular_event_info['Status'] : STATUS_ACTIVE;
+				$event_manager->registerRegularEvent( $short_name, $config['Prefix'].':'.$regular_event_info['EventName'], $regular_event_info['RunInterval'], $regular_event_info['Type'], $event_status);
 			}
 		}
 
@@ -513,11 +578,6 @@
 				$this->Application->registerAggregateTag($aggregate_tag);
 			}
 		}
-
-		if (isset($config['ReplacementTemplates']) && $config['ReplacementTemplates']) {
-			// replacement templates defined in this config
-			$this->Application->ReplacementTemplates = array_merge_recursive2($this->Application->ReplacementTemplates, $config['ReplacementTemplates']);
-		}
 	}
 
 	function ValidateConfig($prefix)
@@ -721,8 +781,18 @@
 					$config['AdminTemplatePath'] = $module_templates . $config['AdminTemplatePath'];
 				}
 
+				if (array_key_exists($prefix, $this->prefixFiles) && ($this->prefixFiles[$prefix] != $filename)) {
+					trigger_error(
+						'Single unit config prefix "<strong>' . $prefix . '</strong>" ' .
+						'is used in multiple unit config files: ' .
+						'"<strong>' . $this->prefixFiles[$prefix] . '</strong>", "<strong>' . $filename . '</strong>"',
+						E_USER_WARNING
+					);
+				}
+
 				$this->configData[$prefix] = $config;
 				$this->prefixFiles[$prefix] = $filename;
+
 				return $prefix;
 			}
 			elseif ($prefix = array_search($filename, $this->prefixFiles)) {
@@ -919,7 +989,4 @@
 		}
 	}
 
-}
-
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
Index: branches/5.1.x/core/units/general/libchart/classes/view/chart/Chart.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/chart/Chart.php	(.../Chart.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/chart/Chart.php	(.../Chart.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/*! \mainpage Libchart
 	 *
 	 * This is the reference API, automatically compiled by <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a>.
@@ -98,5 +100,4 @@
 		public function setTitle($title) {
 			$this->plot->setTitle($title);
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/configuration/configuration.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/configuration/configuration.php	(.../configuration.php)	(revision 12127)
+++ branches/5.1.x/core/units/configuration/configuration.php	(.../configuration.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: configuration.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,8 +12,10 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class ConfigurationItem extends kDBItem {
-		
+
 		/**
 		 * Returns key clause for Load,Update,Delete operations
 		 * Applies current section filter to affect only configuration values,
@@ -29,7 +31,25 @@
 			$keys_hash[$this->IDField] = $this->ID;
 			return parent::GetKeyClause($method, $keys_hash);
 		}
-		
-	}
 
-?>
\ No newline at end of file
+		/**
+		 * Set's field error, if pseudo passed not found then create it with message text supplied.
+		 * Don't owerrite existing pseudo translation.
+		 *
+		 * @param string $field
+		 * @param string $pseudo
+		 * @param string $error_label
+		 */
+		function SetError($field, $pseudo, $error_label = null, $error_params = null)
+		{
+			if (!parent::SetError($field, $pseudo, $error_label, $error_params)) {
+				// this field already has an error -> don't overwrite it
+				return false;
+			}
+
+			$list_errors = $this->Application->GetVar('errors_' . $this->getPrefixSpecial(), Array ());
+			$list_errors[ $this->GetDBField('VariableName') ] = $this->GetErrorMsg($field);
+			$this->Application->SetVar('errors_' . $this->getPrefixSpecial(), $list_errors);
+		}
+
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/themes/themes_tag_processor.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/themes/themes_tag_processor.php	(.../themes_tag_processor.php)	(revision 12127)
+++ branches/5.1.x/core/units/themes/themes_tag_processor.php	(.../themes_tag_processor.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: themes_tag_processor.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: themes_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class ThemesTagProcessor extends kDBTagProcessor
 	{
 		function StylesheetFile($params)
@@ -22,8 +24,8 @@
 				return '';
 			}
 
-			$css_url = $this->Application->BaseURL((defined('WRITEBALE_BASE') ? WRITEBALE_BASE : '/kernel') . '/stylesheets');
-			$css_path = rtrim( str_replace( $this->Application->BaseURL(), FULL_PATH.'/', $css_url), '/' );
+			$css_url = $this->Application->BaseURL(WRITEBALE_BASE . '/stylesheets');
+			$css_path = rtrim( str_replace( $this->Application->BaseURL(), FULL_PATH . '/', $css_url), '/' );
 
 			$last_compiled = $object->GetDBField('LastCompiled');
 
@@ -74,4 +76,3 @@
 			return $object->GetDBField('ThemeId') == $themes_helper->getCurrentThemeId();
 		}
 	}
-?>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_manufacturer.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/general/libchart/classes/view/chart/VerticalBarChart.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/chart/VerticalBarChart.php	(.../VerticalBarChart.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/chart/VerticalBarChart.php	(.../VerticalBarChart.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * Chart composed of vertical bars.
 	 *
@@ -209,5 +211,4 @@
 
 			$this->plot->render($fileName);
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_users_settings.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_users_settings.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_user_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/mailing_lists/mailing_lists_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_lists_config.php 11902 2009-07-15 01:07:23Z dmitrya $
+* @version	$Id: mailing_lists_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'mailing-list',
 		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -59,20 +61,21 @@
 		'Sections' => Array (
 			'in-portal:mailing_folder' => Array (
 				'parent'		=>	'in-portal:users',
-				'icon'			=>	'custom',
+				'icon'			=>	'mailing_list',
 				'label'			=>	'la_title_MailingLists',
+				'use_parent_header' => 1,
 				'permissions'	=>	Array (),
-				'priority'		=>	7,
+				'priority'		=>	5,
 				'type'			=>	stTREE,
 			),
 
 			'in-portal:mailing_lists' => Array (
 				'parent'		=>	'in-portal:mailing_folder',
-				'icon'			=>	'custom',
+				'icon'			=>	'mailing_list',
 				'label'			=>	'la_title_MailingLists',
 				'url'			=>	Array('t' => 'mailing_lists/mailing_list_list', 'pass' => 'm'),
 				'permissions'	=>	Array('view', 'add', 'edit', 'delete'),
-				'priority'		=>	7.1,
+				'priority'		=>	5.1, // <parent_priority>.<own_priority>, because this section replaces parent in tree
 				'type'			=>	stTAB,
 			),
 		),
@@ -104,7 +107,7 @@
 			'Attachments' => Array (
 				'type' => 'string',
 				'formatter' => 'kUploadFormatter', 'upload_dir' => ITEM_FILES_PATH, 'max_size' => 50000000,
-				'multiple' => 10, 'direct_links' => true, 'file_types' => '*.*', 'files_description' => 'All Files',
+				'multiple' => 10, 'direct_links' => true, 'file_types' => '*.*', 'files_description' => '!la_hint_AllFiles!',
 				'default' => NULL
 			),
 
@@ -125,16 +128,16 @@
 
 		'Grids' => Array (
 			'Default' => Array (
-				'Icons' => Array ('default' => 'icon16_custom.gif'),
+				'Icons' => Array ('default' => 'icon16_item.png'),
 				'Fields' => Array (
-					'MailingId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', ),
-					'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ),
-					'MessageText' => Array ('title' => 'la_col_MessageText', 'filter_block' => 'grid_like_filter', 'cut_first' => 100),
-					'MessageHtml' => Array ('title' => 'la_col_MessageHtml', 'filter_block' => 'grid_like_filter', 'cut_first' => 100),
-					'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter',),
-					'EmailsQueued' => Array ('title' => 'la_col_EmailsQueued', 'filter_block' => 'grid_range_filter',),
-					'EmailsSent' => Array ('title' => 'la_col_EmailsSent', 'filter_block' => 'grid_range_filter',),
-					'EmailsTotal' => Array ('title' => 'la_col_EmailsTotal', 'filter_block' => 'grid_range_filter',),
+					'MailingId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+					'Subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200,  ),
+					'MessageText' => Array ('title' => 'la_col_MessageText', 'filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, ),
+					'MessageHtml' => Array ('title' => 'la_col_MessageHtml', 'filter_block' => 'grid_like_filter', 'cut_first' => 100, 'width' => 120, ),
+					'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+					'EmailsQueued' => Array ('title' => 'la_col_EmailsQueued', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+					'EmailsSent' => Array ('title' => 'la_col_EmailsSent', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+					'EmailsTotal' => Array ('title' => 'la_col_EmailsTotal', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
 				),
 			),
 		),
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_view_item_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/tab_back.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/pdf/pdf_renderer_tcpdf.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/pdf/pdf_renderer_tcpdf.php	(.../pdf_renderer_tcpdf.php)	(revision 12127)
+++ branches/5.1.x/core/units/pdf/pdf_renderer_tcpdf.php	(.../pdf_renderer_tcpdf.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pdf_renderer_tcpdf.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: pdf_renderer_tcpdf.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,41 +12,43 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class kTCPDFRenderer extends kPDFRenderer {
-	
+
 	/**
 	 * Enter description here...
 	 *
 	 * @var TCPDF
 	 */
 	public $PDF = null;
-	
+
 	/**
 	 * Enter description here...
 	 *
 	 * @var Zend_Pdf_Page
 	 */
 	public $CurPage = null;
-	
+
 	public $CurFont = null;
 	public $CurFontSize = null;
-	
+
 	function __construct()
 	{
 		$this->IncludeTCPDF();
-		
+
 		$this->PDF = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true);
 		$this->PDF->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
 		$this->PDF->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
 		$this->PDF->setPrintHeader(false);
 		$this->PDF->setPrintFooter(false);
 		$this->PDF->AddPage();
-		
+
 //		$this->PDF->SetX(50);
 //		$this->PDF->SetY(200);
 //		$this->PDF->wr
 	}
-	
+
 	function IncludeTCPDF()
 	{
 		static $included = false;
@@ -88,26 +90,26 @@
 			$included = true;
 		}
 	}
-	
+
 	function NextPage()
 	{
 		$this->PDF->AddPage();
 	}
-	
+
 	function GetWidth()
 	{
 		return $this->PDF->getPageWidth();
 	}
-	
+
 	function GetHeight()
 	{
 		return $this->PDF->getPageHeight();
 	}
-	
+
 	function SetFont($family, $size, $weight=400, $style='normal', $variant='normal')
 	{
 		$this->CurFontSize = $size;
-		
+
 		$family = strtolower($family);
 		switch ($family) {
 			case 'serif':
@@ -127,19 +129,19 @@
 				$font = 'FreeSans';
 				break;
 		}
-		
+
 		$bold = $weight >= 700 ? 'B' : '';
 		$italic = preg_match('/italic|oblique/i', $style) ? 'I' : '';
-				
+
 		return $this->PDF->SetFont($font, $bold.$italic, $size);
 	}
-	
+
 	function SetFontSize($size)
 	{
 		$this->CurFontSize = $size;
 		$this->PDF->SetFontSize($size);
 	}
-	
+
 	function ProcessHTMLColor($color) {
 		$mapping = array(
 			'maroon' => '#800000',
@@ -173,30 +175,30 @@
 		return array(255,255,0);
 
 	}
-	
+
 	function SetFillColor($color)
 	{
 		list($r,$g,$b) = $this->ProcessHTMLColor($color);
 		$this->PDF->SetFillColor($r,$g,$b);
 		$this->PDF->SetTextColor($r,$g,$b);
 	}
-	
+
 	function SetLineColor($color)
 	{
 		list($r,$g,$b) = $this->ProcessHTMLColor($color);
 		return $this->PDF->SetDrawColor($r,$g,$b);
 	}
-	
-	function SetLineWidth($width) 
+
+	function SetLineWidth($width)
 	{
 		return $this->PDF->setLineWidth($width);
 	}
-	
+
 	function DrawLine($x1, $y1, $x2, $y2)
 	{
 		return $this->PDF->Line($x1, $y1, $x2, $y2);
 	}
-	
+
 	function DrawRectangle($x1, $y1, $x2, $y2, $mode='D')
 	{
 		switch ($mode) {
@@ -209,18 +211,18 @@
 			case kPDFRenderer::SHAPE_DRAW_FILL_AND_STROKE :
 				$mode = 'DF';
 				break;
-			
+
 		}
 		$w = $x2-$x1;
 		$h = $y2-$y1;
 		return $this->PDF->Rect($x1, $y1, $w, $h, $mode);
 	}
-	
+
 	function DrawText($text, $x, $y)
 	{
 		return $this->PDF->text($x, $y, $text);
 	}
-	
+
 	function DrawImage($filepath, $x, $y, $w=0, $h=0)
 	{
 		$info = pathinfo($filepath);
@@ -237,36 +239,36 @@
 				$im = @imagecreatefromgif ($filepath);
 				imagepng($im, $converted_filepath);
 			}
-			
+
 			return $this->PDF->Image($converted_filepath, $x, $y, $w, $h);
 		}
 	}
-	
+
 	function GetPDFString()
 	{
 		return $this->PDF->Output('', 'S');
 	}
-	
+
 	function GetAscent()
 	{
 		//$this->CurrentFont['desc']
 		$font = $this->PDF->GetFont();
 		return ($font['desc']['Ascent'] / 1000) * $this->CurFontSize;
 	}
-	
+
 	function GetDescent()
 	{
 		$font = $this->PDF->GetFont();
 		return ($font['desc']['Descent'] / 1000) * $this->CurFontSize;
 	}
-	
+
 	function GetLineGap()
 	{
 		return 0;
 		$font = $this->PDF->GetFont();
 		return (($font['Ascent'] - $font['Descent'])*0 / 1000) * $this->CurFontSize;
 	}
-	
+
 	function GetStringWidth($string)
 	{
 		return $this->PDF->GetStringWidth($string);
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_affiliate_payment_type.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 12657)
@@ -51,13 +51,6 @@
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
-
-				addLoadEvent(
-					function() {
-						// fixes Firefox 2.0+ bug will password autocomplete
-						document.getElementById('<inp2:u_InputName field="Password"/>').value = '';
-					}
-				);
 			</script>
 		</td>
 	</tr>
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_visits.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_logs_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: email_logs_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => 'email-log',
 		'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -72,14 +74,14 @@
 
 		'Grids' => Array (
 			'Default' => Array (
-				'Icons' => Array ('default' => 'icon16_custom.gif'),
+				'Icons' => Array ('default' => 'icon16_item.png'),
 				'Fields' => Array (
-					'EmailLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter',),
-					'fromuser' => Array ('title' => 'la_prompt_FromUsername', 'filter_block' => 'grid_like_filter', ),
-					'addressto' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', ),
-					'subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', ),
-					'event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', ),
-					'timestamp' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', ),
+					'EmailLogId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+					'fromuser' => Array ('title' => 'la_prompt_FromUsername', 'filter_block' => 'grid_like_filter', 'width' => 200,  ),
+					'addressto' => Array ('title' => 'la_prompt_AddressTo', 'filter_block' => 'grid_like_filter', 'width' => 200,  ),
+					'subject' => Array ('title' => 'la_col_Subject', 'filter_block' => 'grid_like_filter', 'width' => 200,  ),
+					'event' => Array ('title' => 'la_col_Event', 'filter_block' => 'grid_like_filter', 'width' => 170,  ),
+					'timestamp' => Array ('title' => 'la_prompt_SentOn', 'filter_block' => 'grid_date_range_filter', 'width' => 145,  ),
 //					'EventParams' => Array ('title' => 'la_col_EventParams', 'filter_block' => 'grid_like_filter', ),
 				),
 			),
Index: branches/5.1.x/core/admin_templates/img/logo_bg.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_update_rates_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/email_messages/email_message_tp.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/email_messages/email_message_tp.php	(.../email_message_tp.php)	(revision 12127)
+++ branches/5.1.x/core/units/email_messages/email_message_tp.php	(.../email_message_tp.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_message_tp.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: email_message_tp.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class EmailMessageTagProcessor extends kDBTagProcessor {
 
 		function PrintRecipients($params)
@@ -46,6 +48,24 @@
 					WHERE '.$id_field.' IN ('.$recipient_ids.')';
 			return $this->Conn->GetCol($sql);
 		}
-	}
 
-?>
\ No newline at end of file
+		/**
+		 * Removes "Enabled" column, when not in debug mode
+		 *
+		 * @param Array $params
+		 */
+		function ModifyUnitConfig($params)
+		{
+			if (!$this->Application->isDebugMode()) {
+				$grids = $this->Application->getUnitOption($this->Prefix, 'Grids');
+
+				foreach ($grids as $grid_name => $grid_data) {
+					if (array_key_exists('Enabled', $grid_data['Fields'])) {
+						unset($grids[$grid_name]['Fields']['Enabled']);
+					}
+				}
+
+				$this->Application->setUnitOption($this->Prefix, 'Grids', $grids);
+			}
+		}
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_settings_custom.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_file_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/users/user_edit_images.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/users/user_edit_images.tpl	(.../user_edit_images.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/users/user_edit_images.tpl	(.../user_edit_images.tpl)	(revision 12657)
@@ -41,7 +41,7 @@
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 
-				a_toolbar.AddButton( new ToolBarButton('new_image', '<inp2:m_phrase label="la_ToolTip_New_Images" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Images" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							std_new_item('u-img', 'users/image_edit')
 						} ) );
@@ -54,6 +54,25 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
 
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('u-img', 'OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('u-img', 'OnMassDecline');
+						}
+				 ) );
+
+
+				 a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('u-img','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+
 				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
 							submit_event('u-img','OnMassMoveUp');
 						}
@@ -64,12 +83,8 @@
 						}
 				 ) );
 
-				 a_toolbar.AddButton( new ToolBarButton('primary_image', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
-							submit_event('u-img','OnSetPrimary');
-						}
-				 ) );
 
-				  a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+				  a_toolbar.AddButton( new ToolBarSeparator('sep5') );
 
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
@@ -100,7 +115,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="u-img" IdField="ImageId" grid="Default" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['u-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','primary_image') );
+	Grids['u-img'].SetDependantToolbarButtons( new Array('edit', 'delete', 'move_up', 'move_down', 'setprimary', 'approve', 'decline') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.1.x/core/install.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/install.php	(.../install.php)	(revision 12127)
+++ branches/5.1.x/core/install.php	(.../install.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: install.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -68,22 +68,22 @@
 		 * @var Array
 		 */
 		var $steps = Array (
-			'fresh_install'		=>	Array ('check_paths', 'db_config', 'select_license', 'download_license', 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'finish'),
-			'clean_reinstall'	=>	Array ('check_paths', 'clean_db', 'db_config', 'select_license', 'download_license', 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'finish'),
+			'fresh_install'		=>	Array ('check_paths', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish'),
+			'clean_reinstall'	=>	Array ('check_paths', 'clean_db', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish'),
 			'already_installed'	=>	Array ('check_paths', 'install_setup'),
 
-			'upgrade'			=>	Array ('check_paths', 'install_setup', 'upgrade_modules', 'finish'),
-			'update_license'	=>	Array ('check_paths', 'install_setup', 'select_license', 'download_license', 'select_domain', 'finish'),
-			'db_reconfig'		=>	Array ('check_paths', 'install_setup', 'db_reconfig', 'finish'),
-			'fix_paths'			=>	Array ('check_paths', 'install_setup', 'fix_paths', 'finish'),
+			'upgrade'			=>	Array ('check_paths', 'install_setup', 'upgrade_modules', 'security', 'finish'),
+			'update_license'	=>	Array ('check_paths', 'install_setup', 'select_license', /*'download_license',*/ 'select_domain', 'security', 'finish'),
+			'db_reconfig'		=>	Array ('check_paths', 'install_setup', 'db_reconfig', 'security', 'finish'),
+			'fix_paths'			=>	Array ('check_paths', 'install_setup', 'fix_paths', 'security', 'finish'),
 		);
 
 		/**
 		 * Steps, that doesn't required admin to be logged-in to proceed
 		 *
 		 * @var Array
 		 */
-		var $skipLoginSteps = Array ('check_paths', 'select_license', 'download_license', 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'finish', -1);
+		var $skipLoginSteps = Array ('check_paths', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish', -1);
 
 		/**
 		 * Steps, on which kApplication should not be initialized, because of missing correct db table structure
@@ -106,6 +106,8 @@
 			'$1/images/emoticons', // for "In-Bulletin"
 			'$1/images/manufacturers', // for "In-Commerce"
 			'$1/images/manufacturers/resized', // for "In-Commerce"
+			'$1/images/polls', // for "In-Bulletin"
+			'$1/images/polls/resized', // for "In-Bulletin"
 			'$1/backupdata',
 			'$1/export',
 			'$1/stylesheets',
@@ -250,7 +252,7 @@
 					foreach ($this->writeableFolders as $folder_path) {
 						$file_path = FULL_PATH . str_replace('$1', $writeable_base, $folder_path);
 						if (file_exists($file_path) && !is_writable($file_path)) {
-							$this->errorMessage = 'Install cannot write to specified folder in the root directory of your installation';
+							$this->errorMessage = '<br/>Installation can not continue until all required permissions are set correctly';
 							break;
 						}
 					}
@@ -387,6 +389,59 @@
 						$this->errorMessage = 'Please select action to perform';
 					}
 					break;
+
+				case 'security':
+					// perform write check
+					if ($this->Application->GetVar('skip_security_check')) {
+						// administrator intensionally skips security checks
+						break;
+					}
+
+					$write_check = true;
+					$check_paths = Array ('/', '/index.php', '/config.php', ADMIN_DIRECTORY . '/index.php');
+					foreach ($check_paths as $check_path) {
+						$path_check_status = $this->toolkit->checkWritePermissions(FULL_PATH . $check_path);
+
+						if (is_bool($path_check_status) && $path_check_status) {
+							$write_check = false;
+							break;
+						}
+					}
+
+					// script execute check
+					if (file_exists(WRITEABLE . '/install_check.php')) {
+						unlink(WRITEABLE . '/install_check.php');
+					}
+
+					$fp = fopen(WRITEABLE . '/install_check.php', 'w');
+					fwrite($fp, "<?php\n\techo 'OK';\n");
+					fclose($fp);
+
+					$curl_helper =& $this->Application->recallObject('CurlHelper');
+					/* @var $curl_helper kCurlHelper */
+
+					$output = $curl_helper->Send($this->Application->BaseURL(WRITEBALE_BASE) . 'install_check.php');
+					unlink(WRITEABLE . '/install_check.php');
+					$execute_check = ($output !== 'OK');
+
+					$directive_check = true;
+					$ini_vars = Array ('register_globals' => false, 'open_basedir' => true, 'allow_url_fopen' => false);
+					foreach ($ini_vars as $var_name => $var_value) {
+						$current_value = ini_get($var_name);
+
+						if (($var_value && !$current_value) || (!$var_value && $current_value)) {
+							$directive_check = false;
+							break;
+						}
+					}
+
+					if (!$write_check || !$execute_check || !$directive_check) {
+						$this->errorMessage = true;
+					}
+					/*else {
+						$this->currentStep = $this->GetNextStep();
+					}*/
+					break;
 			}
 
 			$this->PerformValidation(); // returns validation status (just in case)
@@ -457,20 +512,20 @@
 					break;
 
 				case 'choose_modules':
+					break;
+
 				case 'upgrade_modules':
 					$modules = $this->Application->GetVar('modules');
 					if (!$modules) {
 						$modules = Array ();
 						$this->errorMessage = 'Please select module(-s) to ' . ($this->currentStep == 'choose_modules' ? 'install' : 'upgrade');
 					}
 
-					if ($this->currentStep == 'choose_modules') {
-						// don't check interface modules during install, only for during upgrade
-						break;
-					}
-
 					// check interface module
-					if (!in_array('core', $modules)) {
+					$upgrade_data = $this->GetUpgradableModules();
+
+					if (array_key_exists('core', $upgrade_data) && !in_array('core', $modules)) {
+						// core can be upgraded, but isn't selected
 						$this->errorMessage = 'Please select "Core" as interface module';
 					}
 
@@ -531,6 +586,9 @@
 
 						// set module "Core" version after install (based on upgrade scripts)
 						$this->toolkit->SetModuleVersion('Core');
+
+						// for now we set "In-Portal" module version to "Core" module version (during clean install)
+						$this->toolkit->SetModuleVersion('In-Portal', $this->toolkit->GetMaxModuleVersion('Core'));
 					}
 					break;
 
@@ -680,7 +738,7 @@
 
 					if ($domain != '') {
 						if (strstr($domain, $license_domain) || $modules_helper->_IsLocalSite($domain)) {
-							$this->toolkit->setSystemConfig('Intechnic', 'Domain', $domain);
+							$this->toolkit->setSystemConfig('Misc', 'Domain', $domain);
 							$this->toolkit->SaveConfig();
 						}
 						else {
@@ -700,11 +758,18 @@
 						'RootPass' => $password,
 						'Site_Path' => BASE_PATH.'/', // set Site_Path (for SSL & old in-portal code)
 						'Backup_Path' => FULL_PATH . $this->toolkit->getSystemConfig('Misc', 'WriteablePath') . DIRECTORY_SEPARATOR . 'backupdata',
-						'Smtp_AdminMailFrom' => 'portal@' . $this->toolkit->getSystemConfig('Intechnic', 'Domain')
+						'Smtp_AdminMailFrom' => 'portal@' . $this->toolkit->getSystemConfig('Misc', 'Domain')
 					);
 
 					$this->toolkit->saveConfigValues($config_values);
 
+					// login as "root", when no errors on password screen
+					$this->Application->SetVar('login', 'root');
+					$this->Application->SetVar('password', $this->Application->GetVar('root_password'));
+
+					$login_event = new kEvent('u.current:OnLogin');
+					$this->Application->HandleEvent($login_event);
+
 					// import base language for core (english)
 					$this->toolkit->ImportLanguage('/core/install/english');
 
@@ -824,6 +889,11 @@
 							// after upgrade sqls are executed update version and upgrade language pack
 							$this->toolkit->SetModuleVersion($module_name, $module_info['ToVersion']);
 						}
+
+						// for now we set "In-Portal" module version to "Core" module version (during upgrade)
+						if (in_array('core', $modules)) {
+							$this->toolkit->SetModuleVersion('In-Portal', $upgrade_data['core']['ToVersion']);
+						}
 					}
 					break;
 
@@ -1074,8 +1144,8 @@
 			if (!isset($modules)) {
 				$modules = Array();
 				$fh = opendir(MODULES_PATH);
-				while (($sub_folder = readdir($fh))) {
-					$folder_path = MODULES_PATH.'/'.$sub_folder;
+				while ( ($sub_folder = readdir($fh)) ) {
+					$folder_path = MODULES_PATH . '/'.$sub_folder;
 					if ($sub_folder != '.' && $sub_folder != '..' && is_dir($folder_path)) {
 						if ($sub_folder == 'core') {
 							// skip modules here
@@ -1336,5 +1406,32 @@
 				$this->Done($errstr);
 			}
 		}
+
+		/**
+		 * Checks, that given button should be visible on current installation step
+		 *
+		 * @param string $name
+		 * @return bool
+		 */
+		function buttonVisible($name)
+		{
+			$button_visibility = Array (
+				'continue' => $this->GetNextStep() != -1 || ($this->stepsPreset == 'already_installed'),
+				'refresh' => in_array($this->currentStep, Array ('check_paths', 'security')),
+				'back' => in_array($this->currentStep, Array (/*'select_license',*/ 'download_license', 'select_domain')),
+			);
+
+			if ($name == 'any') {
+				foreach ($button_visibility as $button_name => $button_visible) {
+					if ($button_visible) {
+						return true;
+					}
+				}
+
+				return false;
+			}
+
+			return array_key_exists($name, $button_visibility) ? $button_visibility[$name] : true;
+		}
 	}
 ?>
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/js/forms.js
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/js/forms.js	(.../forms.js)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/js/forms.js	(.../forms.js)	(revision 12657)
@@ -62,8 +62,8 @@
 	// process all FCKEditor instances
 	var iframes = document.getElementsByTagName('IFRAME');
 
-	for (var i=0; i<iframes.length; i++) {
-		if (iframes[i].id.match(/___Frame$/)) {
+	for (var i = 0; i < iframes.length; i++) {
+		if (iframes[i].id.match(/___Frame$/) && iframes[i].getAttribute('latesrc')) {
 			iframes[i].contentWindow.location = iframes[i].getAttribute('latesrc');
 		}
 	}
@@ -90,6 +90,9 @@
 
 Form.Init = function(id) {
 	this.Div = document.getElementById(id);
+	if (!this.Div) {
+		return ;
+	}
 
 	for (var i = 0; i < this.Controls.length; i++) {
 		dim = getDimensions( document.getElementById(this.Controls[i]) );
@@ -200,8 +203,11 @@
 	return parseInt($size);
 }
 
-Form.Resize = function()
-{
+Form.Resize = function() {
+	if (!this.Div) {
+		return ;
+	}
+
 	var h = (document.all ? window.document.body.offsetHeight : window.innerHeight);
 
 	var $div = $(this.Div);
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_user.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_option_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/groups/groups_item.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/groups/groups_item.php	(.../groups_item.php)	(revision 12127)
+++ branches/5.1.x/core/units/groups/groups_item.php	(.../groups_item.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: groups_item.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: groups_item.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,24 +12,24 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-class GroupsItem extends kDBItem {
+	defined('FULL_PATH') or die('restricted access!');
 
-	function Create($force_id = false, $system_create = false)
-	{
-		if (!$this->Validate()) return false;
-		$this->SetDBField('ResourceId', $this->Application->NextResourceId());
+	class GroupsItem extends kDBItem {
 
-		return parent::Create();
-	}
+		function Create($force_id = false, $system_create = false)
+		{
+			if (!$this->Validate()) return false;
+			$this->SetDBField('ResourceId', $this->Application->NextResourceId());
 
-	function Update($id = null, $system_update = false)
-	{
-		$this->VirtualFields['ResourceId'] = Array();
-		$ret = parent::Update($id, $system_update);
-		unset($this->VirtualFields['ResourceId']);
-		
-		return $ret;
-	}
-}
+			return parent::Create();
+		}
 
-?>
\ No newline at end of file
+		function Update($id = null, $system_update = false)
+		{
+			$this->VirtualFields['ResourceId'] = Array();
+			$ret = parent::Update($id, $system_update);
+			unset($this->VirtualFields['ResourceId']);
+
+			return $ret;
+		}
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_option.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_catalog.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r12453 -r12657
--- branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 12453)
+++ branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 12453 2009-09-05 14:11:39Z alex $
+* @version	$Id: install_toolkit.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * Upgrade sqls are located using this mask
 	 *
@@ -198,8 +200,9 @@
 				$module_name = 'in-portal';
 			}
 
+			// don't use "adodb_mktime" here, because it's not yet included
 			$sql = 'UPDATE ' . $table_prefix . 'Modules
-					SET Version = "' . $version . '"
+					SET Version = "' . $version . '", BuildDate = ' . time() . '
 					WHERE LOWER(Name) = "' . strtolower($module_name) . '"';
 			$this->Conn->Query($sql);
 		}
@@ -305,13 +308,27 @@
 			}
 
 			$sqls = str_replace("\r\n", "\n", $sqls);  // convert to linux line endings
-			$sqls = preg_replace("/#([^;]*?)\n/", '', $sqls); // remove all comments
-			$sqls = explode(";\n", $sqls . "\n"); // ensures that last sql won't have ";" in it
+			$no_comment_sqls = preg_replace("/#\s([^;]*?)\n/is", '', $sqls); // remove all comments "#" on new lines
 
+			if ($no_comment_sqls === null) {
+				// "ini.pcre.backtrack-limit" reached and error happened
+				$sqls = explode(";\n", $sqls . "\n"); // ensures that last sql won't have ";" in it
+				$sqls = array_map('trim', $sqls);
+
+				// remove all comments "#" on new lines (takes about 2 seconds for 53000 sqls)
+				$sqls = preg_replace("/#\s([^;]*?)/", '', $sqls);
+			}
+			else {
+				$sqls = explode(";\n", $no_comment_sqls . "\n"); // ensures that last sql won't have ";" in it
+				$sqls = array_map('trim', $sqls);
+			}
+
+			$sql_count = count($sqls);
 			$db_collation = $this->getSystemConfig('Database', 'DBCollation');
-			for ($i=$start_from; $i<count($sqls); $i++) {
-				$sql = trim($sqls[$i]);
-				if (!$sql) {
+
+			for ($i = $start_from; $i < $sql_count; $i++) {
+				$sql = $sqls[$i];
+				if (!$sql || (substr($sql, 0, 1) == '#')) {
 					continue; // usually last line
 				}
 
@@ -386,7 +403,7 @@
 			$table_name = $this->Application->getUnitOption('theme', 'TableName');
 
 			$sql = 'SELECT Name, ' . $id_field . '
-					FROM ' . $table_name;
+					FROM ' . $table_name . 'ORDER BY Name ASC';
 			return $this->Conn->GetCol($sql, $id_field);
 		}
 
@@ -539,14 +556,88 @@
 		 */
 		function getModuleName($module_folder)
 		{
-			if ($module_folder == 'kernel') {
-				$module_folder = 'in-portal';
+			return implode('-', array_map('ucfirst', explode('-', $module_folder)));
+		}
+
+		/**
+		 * Returns information about module (based on "install/module_info.xml" file)
+		 *
+		 * @param string $module_folder
+		 * @return Array
+		 */
+		function getModuleInfo($module_folder)
+		{
+			$info_file = MODULES_PATH . '/' . $module_folder . '/install/module_info.xml';
+
+			if (!file_exists($info_file)) {
+				return Array ();
 			}
 
-			return implode('-', array_map('ucfirst', explode('-', $module_folder)));
+			$xml_helper =& $this->Application->recallObject('kXMLHelper');
+			/* @var $xml_helper kXMLHelper */
+
+			$root_node =& $xml_helper->Parse( file_get_contents($info_file) );
+
+			if (!is_object($root_node) || !preg_match('/^kxmlnode/i', get_class($root_node)) || ($root_node->Name == 'ERROR')) {
+				// non-valid xml file
+				return Array ();
+			}
+
+			$ret = Array ();
+			$current_node =& $root_node->firstChild;
+
+			do {
+				$ret[ strtolower($current_node->Name) ] = trim($current_node->Data);
+			} while (($current_node =& $current_node->NextSibling()));
+
+			return $ret;
 		}
 
 		/**
+		 * Returns nice module string to be used on install/upgrade screens
+		 *
+		 * @param string $module_folder
+		 * @param string $version_string
+		 * @return string
+		 */
+		function getModuleString($module_folder, $version_string)
+		{
+			// image (if exists) <description> (<name> <version>)
+
+			$ret = Array ();
+			$module_info = $this->getModuleInfo($module_folder);
+
+			if (array_key_exists('name', $module_info) && $module_info['name']) {
+				$module_name = $module_info['name'];
+			}
+			else {
+				$module_name = $this->getModuleName($module_folder);
+			}
+
+			if (array_key_exists('image', $module_info) && $module_info['image']) {
+				$image_src = $module_info['image'];
+
+				if (!preg_match('/^(http|https):\/\//', $image_src)) {
+					// local image -> make absolute url
+					$image_src = $this->Application->BaseURL() . $image_src;
+				}
+
+				$ret[] = '<img src="' . $image_src . '" alt="' . htmlspecialchars($module_name) . '" title="' . htmlspecialchars($module_name) . '" style="vertical-align:middle; margin: 3px 0 3px 5px"/>';
+			}
+
+			if (array_key_exists('description', $module_info) && $module_info['description']) {
+				$ret[] = $module_info['description'];
+			}
+			else {
+				$ret[] = $module_name;
+			}
+
+			$ret[] = '(' . $module_name . ' ' . $version_string . ')';
+
+			return implode(' ', $ret);
+		}
+
+		/**
 		 * Creates module root category in "Home" category using given data and returns it
 		 *
 		 * @param string $name
@@ -571,7 +662,7 @@
 
 			$category_fields = Array (
 				$fields['name'] => $name, 'Filename' => $name, 'AutomaticFilename' => 1,
-				$fields['description'] => $description, 'Status' => $status, 'Priority' => -9999,
+				$fields['description'] => $description, 'Status' => STATUS_ACTIVE, 'Priority' => -9999,
 			);
 
 			$category_fields['ParentId'] = $this->Application->findModule('Name', 'Core', 'RootCat');
@@ -732,4 +823,21 @@
 		{
 			$this->Application->HandleEvent($themes_event, 'adm:OnRebuildThemes');
 		}
+
+		/**
+		 * Checks that file is writable by group or others
+		 *
+		 * @param string $file
+		 * @return boolean
+		 */
+		function checkWritePermissions($file)
+		{
+			if (DIRECTORY_SEPARATOR == '\\') {
+				// windows doen't allow to check permissions (always returns null)
+				return null;
+			}
+
+			$permissions = fileperms($file);
+			return $permissions & 0x0010 || $permissions & 0x0002;
+		}
 	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/tab_back.jpg
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/pdf/pdf_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/pdf/pdf_config.php	(.../pdf_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/pdf/pdf_config.php	(.../pdf_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pdf_config.php 11902 2009-07-15 01:07:23Z dmitrya $
+* @version	$Id: pdf_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-	$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'pdf',
 					'EventHandlerClass'	=>	Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
 
Index: branches/5.1.x/core/units/user_profile/user_profile_tp.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 12127)
+++ branches/5.1.x/core/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_profile_tp.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: user_profile_tp.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class UserProfileTagProcessor extends kDBTagProcessor {
 
 		function Field($params)
@@ -161,6 +163,5 @@
 
 			return Array($id, $field);
 		}
-	}
 
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_sessions_log.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_email_log.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/statistics/statistics_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/statistics/statistics_config.php	(.../statistics_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/statistics/statistics_config.php	(.../statistics_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: statistics_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: statistics_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'stat',
 					'ItemClass'			=>	Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 					'ListClass'			=>	Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
@@ -61,7 +63,7 @@
 
 					'Grids'	=> Array(
 										'Default'	=>	Array(
-																'Icons' => Array('default' => 'icon16_custom.gif'),
+																'Icons' => Array('default' => 'icon16_item.png'),
 																'Fields' => Array(
 																					'Login'			=> Array('title' => 'la_col_Username', 'data_block' => 'grid_checkbox_td'),
 																					'LastName'		=> Array( 'title'=>'la_col_LastName'),
@@ -72,6 +74,4 @@
 
 								),
 
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/tools/backup3.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/tools/backup3.tpl	(.../backup3.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/tools/backup3.tpl	(.../backup3.tpl)	(revision 12657)
@@ -34,7 +34,7 @@
 		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 			<inp2:m_inc param="tab_index" by="1"/>
 			<td colspan="3" class="text">
-				<inp2:m_Phrase label="la_Text_BackupComplete"/><br />
+				<inp2:m_Phrase label="la_Text_BackupComplete"/><br/><br/>
 				<inp2:m_Recall var="adm.backupcomplete_filename"/>
 				<inp2:m_Recall var="adm.backupcomplete_filesize"/> M<inp2:m_Phrase label="la_text_Bytes"/>
 			</td>
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_list_conf.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/tools/cron.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/tools/cron.php	(.../cron.php)	(revision 12127)
+++ branches/5.1.x/tools/cron.php	(.../cron.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cron.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: cron.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,26 +12,38 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-// Use this line to invoke from cron.
-// wget http://<server_address>/tools/cron.php -O /dev/null > /dev/null 2>&1
+	// Use this line to invoke from cron.
+	// wget http://<server_address>/tools/cron.php -O /dev/null > /dev/null 2>&1
 
-define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
-define('REL_PATH', 'tools/');
-define('ADMIN', 1);
+	$start = getmicrotime();
 
-include_once(FULL_PATH.'/core/kernel/startup.php');
+	define('CRON', 1);
+	define('ADMIN', 1);
+	define('REL_PATH', 'tools');
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/..'));
+	define('CMD_MODE', isset($argv) && count($argv) ? 1 : 0);
 
-$application =& kApplication::Instance();
-$application->Init();
+	if (CMD_MODE) {
+		define('DBG_SKIP_REPORTING', 1);
+		$_SERVER['HTTP_USER_AGENT'] = 'gecko';
+		$_SERVER['HTTP_HOST'] = 'localhost';
+	}
 
-$event_manager =& $application->recallObject('EventManager');
-$event_manager->RunRegularEvents(reBEFORE, true);
-$event_manager->RunRegularEvents(reAFTER, true);
+	include_once(FULL_PATH . '/core/kernel/startup.php');
 
-function getmicrotime()
-{
-    list($usec, $sec) = explode(" ", microtime());
-    return ((float)$usec + (float)$sec);
-}
+	$application =& kApplication::Instance();
+	$application->Init();
 
-?>
\ No newline at end of file
+	// events from request are not processed, only predefined regular events
+	$application->EventManager->RunRegularEvents(reBEFORE, true);
+	$application->EventManager->RunRegularEvents(reAFTER, true);
+
+	$application->Done();
+
+	$end = getmicrotime();
+
+	function getmicrotime()
+	{
+	    list($usec, $sec) = explode(" ", microtime());
+	    return ((float)$usec + (float)$sec);
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_cat_new.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/mailing_lists/mailing_list_tp.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/mailing_lists/mailing_list_tp.php	(.../mailing_list_tp.php)	(revision 12127)
+++ branches/5.1.x/core/units/mailing_lists/mailing_list_tp.php	(.../mailing_list_tp.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_tp.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: mailing_list_tp.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class MailingListTagProcessor extends kDBTagProcessor {
 
 		function PrintRecipients($params)
Index: branches/5.1.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12127)
+++ branches/5.1.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 11963 2009-07-22 15:13:17Z alex $
+* @version	$Id: categories_tag_processor.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -83,26 +83,46 @@
 
 	function ItemIcon($params)
 	{
-		// only for categories, not structure
-		if ($this->Prefix != 'c') {
-			return parent::ItemIcon($params);
+		$grids = $this->Application->getUnitOption($this->Prefix, 'Grids');
+		$grid = $grids[ $params['grid'] ];
+
+		if (!array_key_exists('Icons', $grid)) {
+			return '';
 		}
 
+		$icons = $grid['Icons'];
+
+		if (array_key_exists('name', $params)) {
+			$icon_name = $params['name'];
+			return array_key_exists($icon_name, $icons) ? $icons[$icon_name] : '';
+		}
+
 		$object =& $this->getObject($params);
-		if ($object->GetDBField('IsMenu')) {
-			$status = $object->GetDBField('Status');
-			if ($status == 1) {
-				$ret = $object->GetDBField('IsNew') ? 'icon16_cat_new.gif' : 'icon16_folder.gif';
-			}
-			else {
-				$ret = $status ? 'icon16_cat_pending.gif' : 'icon16_cat_disabled.gif';
-			}
+		/* @var $object kDBList */
+
+		if ($object->GetDBField('CreatedBySystem')) {
+			return 'icon16_section_system.png';
 		}
-		else {
-			$ret = 'icon16_folder-red.gif';
+
+		$status = $object->GetDBField('Status');
+
+		if ($status == STATUS_DISABLED) {
+			return 'icon16_section_disabled.png';
 		}
 
-		return $ret;
+		if (!$object->GetDBField('IsMenu')) {
+			return 'icon16_section_menuhidden.png';
+		}
+
+		if ($status == STATUS_PENDING) {
+			return 'icon16_section_pending.png';
+		}
+
+		if ($object->GetDBField('IsNew')) {
+			return 'icon16_section_new.png';
+		}
+
+		return 'icon16_section.png';
 	}
 
 	function ItemCount($params)
@@ -182,7 +202,7 @@
 		$cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List');
 		$sql = 'SELECT '.$this->getTitleField().'
 				FROM '.$cat_object->TableName.'
-				WHERE CategoryId = '.$this->Application->GetVar('m_cat_id');
+				WHERE CategoryId = '.(int)$this->Application->GetVar('m_cat_id');
 		return $this->Conn->GetOne($sql);
 	}
 
@@ -601,10 +621,13 @@
 
 	function CatalogItemCount($params)
 	{
+		$params['skip_quering'] = true;
 		$object =& $this->GetList($params);
+
 		if (!$object->Counted) {
 			$object->CountRecs();
 		}
+
 		return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' / '.$object->NoFilterCount : $object->RecordsCount;
 	}
 
@@ -673,7 +696,7 @@
 		if (!isset($current_path)) {
 			$sql = 'SELECT ParentPath
 					FROM ' . TABLE_PREFIX . 'Category
-					WHERE CategoryId = ' . $this->Application->GetVar('m_cat_id');
+					WHERE CategoryId = ' . (int)$this->Application->GetVar('m_cat_id');
 			$current_path = $this->Conn->GetOne($sql);
 		}
 
@@ -1033,7 +1056,12 @@
 				}
 				else {
 					// no relation with current category object -> query from db
-					$sql = 'SELECT l' . $this->Application->GetVar('m_lang') . '_CachedNavbar
+					$language_id = (int)$this->Application->GetVar('m_lang');
+					if (!$language_id) {
+						$language_id = 1;
+					}
+
+					$sql = 'SELECT l' . $language_id . '_CachedNavbar
 							FROM ' . $object->TableName . '
 							WHERE ' . $object->IDField . ' = ' . $category_id;
 					$cached_navbar = $this->Conn->GetOne($sql);
@@ -1135,7 +1163,7 @@
 
 		$edit_code_before = $edit_code_after = '';
 
-		if (EDITING_MODE == EDITING_MODE_CMS) {
+		if (EDITING_MODE == EDITING_MODE_CONTENT) {
 			$bg_color = isset($params['bgcolor']) ? $params['bgcolor'] : '#ffffff';
 			$url_params = Array (
 				'pass'			=>	'm,c,content',
@@ -1162,11 +1190,11 @@
 			$edit_url = $this->Application->HREF('categories/edit_content', ADMIN_DIRECTORY, $url_params, 'index.php');
 			$edit_code_before = '
 				<div class="cms-edit-btn-container">
-					<div class="cms-edit-btn" style="' . $additional_css . '" onclick="$form_name=\'kf_cont_'.$content->GetID().'\'; open_popup(\'content\', \'OnEdit\', \'categories/edit_content\');">
+					<div class="cms-edit-btn" style="' . $additional_css . '" onclick="$form_name=\'kf_cont_'.$content->GetID().'\'; std_edit_item(\'content\', \'categories/edit_content\');">
 						<div class="cms-btn-image">
-							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
+							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.png" width="15" height="16" alt=""/>
 						</div>
-						<div class="cms-btn-text">Edit '.(defined('DEBUG_MODE') && DEBUG_MODE ? " - #{$num}" : '').'</div>
+						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_EditContent', false) . ' '.(defined('DEBUG_MODE') && DEBUG_MODE ? " - #{$num}" : '').'</div>
 					</div>
 					<div class="cms-btn-content">';
 
@@ -1331,7 +1359,7 @@
 		$ret = '<link rel="stylesheet" href="' . $js_url . '/jquery/thickbox/thickbox.css" type="text/css" media="screen"/>' . "\n";
 		$ret .= '<link rel="stylesheet" href="' . $js_url . '/../incs/cms.css" type="text/css" media="screen"/>' . "\n";
 
-		if (EDITING_MODE == EDITING_MODE_LAYOUT) {
+		if (EDITING_MODE == EDITING_MODE_DESIGN) {
 			$ret .= '	<style type="text/css" media="all">
 							div.movable-element .movable-header { cursor: move; }
 						</style>';
@@ -1345,49 +1373,56 @@
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/jquery/thickbox/thickbox.js"></script>' . "\n";
 		$ret .= '<script type="text/javascript" src="' . $js_url . '/template_manager.js"></script>' . "\n";
 		$ret .= '<script language="javascript">' . "\n";
-		$ret .= "TB.pathToImage = 'js/jquery/thickbox/loadingAnimation.gif';" . "\n";
+		$ret .= "TB.pathToImage = '" . $js_url . "/jquery/thickbox/loadingAnimation.gif';" . "\n";
 
 		$template = $this->Application->GetVar('t');
 		$theme_id = $this->Application->GetVar('m_theme');
 
-		$url_params = Array ('block' => '#BLOCK#', 'theme-file_event' => '#EVENT#', 'theme_id' => $theme_id, 'source' => $template, 'pass' => 'all,theme-file', 'front' => 1, 'no_amp' => 1);
+		$url_params = Array ('block' => '#BLOCK#', 'theme-file_event' => '#EVENT#', 'theme_id' => $theme_id, 'source' => $template, 'pass' => 'all,theme-file', 'front' => 1, 'm_opener' => 'd', 'no_amp' => 1);
 		$edit_template_url = $this->Application->HREF('themes/template_edit', ADMIN_DIRECTORY, $url_params, 'index.php');
 
 		$url_params = Array ('theme-file_event' => 'OnSaveLayout', 'source' => $template, 'pass' => 'all,theme-file', 'no_amp' => 1);
 		$save_layout_url = $this->Application->HREF('index', '', $url_params);
 
 		$this_url = $this->Application->HREF('', '', Array ('editing_mode' => '#EDITING_MODE#', 'no_amp' => 1));
 		$ret .= "var aTemplateManager = new TemplateManager('" . $edit_template_url . "', '" . $this_url . "', '" . $save_layout_url . "', " . (int)EDITING_MODE . ");\n";
-
-		$ret .= "var \$modal_windows = " . ($this->Application->ConfigValue('UseModalWindows') ? 'true' : 'false') . ";\n";
 		$ret .= "var main_title = '" . addslashes( $this->Application->ConfigValue('Site_Name') ) . "';" . "\n";
-		$ret .= "var base_url = '" . $this->Application->BaseURL() . "';" . "\n";
-		$ret .= 'TB.closeHtml = \'<img src="' . $js_url . '/../img/close_window15.gif" width="15" height="15" style="border-width: 0px;" alt="close"/><br/>\';' . "\n";
 
-		$url_params = Array('m_theme' => '', 'pass' => 'm', 'm_opener' => 'r', 'no_amp' => 1);
-		$browse_url = $this->Application->HREF('catalog/catalog', ADMIN_DIRECTORY, $url_params, 'index.php');
-		$browse_url = preg_replace('/&(admin|editing_mode)=[\d]/', '', $browse_url);
+		$use_popups = (int)$this->Application->ConfigValue('UsePopups');
+		$ret .= "var \$use_popups = " . ($use_popups > 0 ? 'true' : 'false') . ";\n";
+		$ret .= "var \$modal_windows = " . ($use_popups == 2 ? 'true' : 'false') . ";\n";
 
-		$ret .= '
-			var topmost = window.top;
+		if (EDITING_MODE != EDITING_MODE_BROWSE) {
+			$ret .= "var base_url = '" . $this->Application->BaseURL() . "';" . "\n";
+			$ret .= 'TB.closeHtml = \'<img src="' . $js_url . '/../img/close_window15.gif" width="15" height="15" style="border-width: 0px;" alt="close"/><br/>\';' . "\n";
 
-			topmost.document.title = document.title + \' - '.$this->Application->Phrase('la_AdministrativeConsole').'\';
-			t = \''.$this->Application->GetVar('t').'\';
+			$url_params = Array('m_theme' => '', 'pass' => 'm', 'm_opener' => 'r', 'no_amp' => 1);
+			$browse_url = $this->Application->HREF('catalog/catalog', ADMIN_DIRECTORY, $url_params, 'index.php');
+			$browse_url = preg_replace('/&(admin|editing_mode)=[\d]/', '', $browse_url);
 
-			if (window.parent.frames["menu"] != undefined) {
-				if ( $.isFunction(window.parent.frames["menu"].SyncActive) ) {
-					window.parent.frames["menu"].SyncActive("' . $browse_url . '");
+			$ret .= '
+				var topmost = window.top;
+
+				topmost.document.title = document.title + \' - '.$this->Application->Phrase('la_AdministrativeConsole', false).'\';
+				t = \''.$this->Application->GetVar('t').'\';
+
+				if (window.parent.frames["menu"] != undefined) {
+					if ( $.isFunction(window.parent.frames["menu"].SyncActive) ) {
+						window.parent.frames["menu"].SyncActive("' . $browse_url . '");
+					}
 				}
-			}
-		';
+			';
+		}
 
 		$ret .= '</script>' . "\n";
 
-		// add form, so admin scripts could work
-		$ret .= '<form id="kernel_form" name="kernel_form" enctype="multipart/form-data" method="post" action="' . $browse_url . '">
-					<input type="hidden" name="MAX_FILE_SIZE" id="MAX_FILE_SIZE" value="' . MAX_UPLOAD_SIZE . '" />
-					<input type="hidden" name="sid" id="sid" value="' . $this->Application->GetSID() . '" />
-				</form>';
+		if (EDITING_MODE != EDITING_MODE_BROWSE) {
+			// add form, so admin scripts could work
+			$ret .= '<form id="kernel_form" name="kernel_form" enctype="multipart/form-data" method="post" action="' . $browse_url . '">
+						<input type="hidden" name="MAX_FILE_SIZE" id="MAX_FILE_SIZE" value="' . MAX_UPLOAD_SIZE . '" />
+						<input type="hidden" name="sid" id="sid" value="' . $this->Application->GetSID() . '" />
+					</form>';
+		}
 
 		return $ret;
 	}
@@ -1409,48 +1444,79 @@
 
 		$page =& $this->_getPage($params);
 
-		if (!$page->isLoaded()) {
+		if (!$page->isLoaded() || (($display_mode != 'end') && (EDITING_MODE == EDITING_MODE_BROWSE))) {
 			// when "EditingScripts" tag is not used, make sure, that scripts are also included
 			return $this->EditingScripts($params);
 		}
 
 		// show "EditPage" button only for pages, that exists in structure
 		if ($display_mode != 'end') {
-			$url_params = Array(
-				'pass'			=>	'm,c',
-				'm_opener'		=>	'd',
-				'c_id'		=>	$page->GetID(),
-				'c_mode'		=>	't',
-				'c_event'		=>	'OnEdit',
-				'front'			=>	1,
-				'__URLENCODE__'	=>	1,
-				'__NO_REWRITE__'=>	1,
-				'escape'		=>	1,
-				'index_file' => 'index.php',
-			);
+			$edit_btn = '';
 
-			$edit_url = $this->Application->HREF('categories/categories_edit', '/admin', $url_params);
+			if (EDITING_MODE == EDITING_MODE_CONTENT) {
+				$url_params = Array(
+					'pass'			=>	'm,c',
+					'm_opener'		=>	'd',
+					'c_id'			=>	$page->GetID(),
+					'c_mode'		=>	't',
+					'c_event'		=>	'OnEdit',
+					'front'			=>	1,
+					'__URLENCODE__'	=>	1,
+					'__NO_REWRITE__'=>	1,
+					'escape'		=>	1,
+					'index_file' => 'index.php',
+				);
 
-			$edit_btn = '';
+				$edit_url = $this->Application->HREF('categories/categories_edit', ADMIN_DIRECTORY, $url_params);
 
-			if (EDITING_MODE == EDITING_MODE_LAYOUT) {
 				$edit_btn .= '
-					<div class="cms-save-layout-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onclick="aTemplateManager.saveLayout(); return false;">
+					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\''.$edit_url.'\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'c\', \'categories/categories_edit\');">
 						<div class="cms-btn-image">
-							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
+							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/section_properties.png" width="15" height="16" alt=""/>
 						</div>
-						<div class="cms-btn-text">Save Layout</div>
+						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SectionProperties', false) . '</div>
 					</div>' . "\n";
-			}
+			} elseif (EDITING_MODE == EDITING_MODE_DESIGN) {
+				$url_params = Array(
+					'pass'			=>	'm,theme',
+					'm_opener'		=>	'd',
+					'theme_id'		=>	$this->Application->GetVar('m_theme'),
+					'theme_mode'	=>	't',
+					'theme_event'	=>	'OnEdit',
+					'theme-file_id' =>	$this->_getThemeFileId(),
+					'front'			=>	1,
+					'__URLENCODE__'	=>	1,
+					'__NO_REWRITE__'=>	1,
+					'escape'		=>	1,
+					'index_file' => 'index.php',
+				);
 
-			$edit_btn .= '
-				<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\''.$edit_url.'\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; open_popup(\'c\', \'OnEdit\', \'categories/categories_edit\');">
-					<div class="cms-btn-image">
-						<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
+				$edit_url = $this->Application->HREF('themes/file_edit', ADMIN_DIRECTORY, $url_params);
+
+				$edit_btn .= '
+					<div class="cms-layout-btn-container"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . '>
+						<div class="cms-save-layout-btn" onclick="aTemplateManager.saveLayout(); return false;">
+							<div class="cms-btn-image">
+								<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/save_button.gif" width="16" height="16" alt=""/>
+							</div>
+							<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SaveChanges', false) . '</div>
+						</div>
+						<div class="cms-cancel-layout-btn" onclick="aTemplateManager.cancelLayout(); return false;">
+							<div class="cms-btn-image">
+								<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/cancel_button.gif" width="16" height="16" alt=""/>
+							</div>
+							<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_Cancel', false) . '</div>
+						</div>
 					</div>
-					<div class="cms-btn-text">Section Properties</div>
-				</div>' . "\n";
 
+					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\''.$edit_url.'\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'theme\', \'themes/file_edit\');">
+						<div class="cms-btn-image">
+							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/section_properties.png" width="15" height="16" alt=""/>
+						</div>
+						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SectionTemplate', false) . '</div>
+					</div>' . "\n";
+			}
+
 			if ($display_mode == 'start') {
 				// button with border around the page
 				$edit_code .= '<div class="cms-section-properties-btn-container">' . $edit_btn . '<div class="cms-btn-content">';
@@ -1477,6 +1543,26 @@
 		return $edit_code;
 	}
 
+	function _getThemeFileId()
+	{
+		$template = $this->Application->GetVar('t');
+
+		if (!$this->Application->TemplatesCache->TemplateExists($template) && !$this->Application->IsAdmin()) {
+			$cms_handler =& $this->Application->recallObject($this->Prefix . '_EventHandler');
+			/* @var $cms_handler CategoriesEventHandler */
+
+			$template = ltrim($cms_handler->GetDesignTemplate(), '/');
+		}
+
+		$file_path = dirname($template) == '.' ? '' : '/' . dirname($template);
+		$file_name = basename($template);
+
+		$sql = 'SELECT FileId
+				FROM ' . TABLE_PREFIX . 'ThemeFiles
+				WHERE (FilePath = ' . $this->Conn->qstr($file_path) . ') AND (FileName = ' . $this->Conn->qstr($file_name . '.tpl') . ')';
+		return $this->Conn->GetOne($sql);
+	}
+
 	/**
 	 * Builds cached menu version
 	 *
@@ -1736,10 +1822,18 @@
 	{
 		$object =& $this->getObject($params);
 
-		$template = $object->GetDBField('NamedParentPath');
-		$url_params = Array ('admin' => 1, 'pass' => 'm', 'm_cat_id' => $object->GetID(), 'index_file' => 'index.php');
+		$themes_helper =& $this->Application->recallObject('ThemesHelper');
+		/* @var $themes_helper kThemesHelper */
 
-		return $this->Application->HREF($template, '_FRONT_END_', $url_params);
+		$url_params = Array (
+			'm_cat_id' => $object->GetID(),
+			'm_theme' => $themes_helper->getCurrentThemeId(),
+			'pass' => 'm',
+			'admin' => 1,
+			'index_file' => 'index.php'
+		);
+
+		return $this->Application->HREF($object->GetDBField('NamedParentPath'), '_FRONT_END_', $url_params);
 	}
 
 	/**
@@ -1941,8 +2035,12 @@
 		$id_field = $this->Application->getUnitOption($this->Prefix, 'IDField');
 		$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
 
-		$language = $this->Application->GetVar('m_lang');
+		$language = (int)$this->Application->GetVar('m_lang');
 
+		if (!$language) {
+			$language = 1;
+		}
+
 		$sql = 'SELECT l'.$language.'_Name AS Name, NamedParentPath
 				FROM '.$table_name.'
 				WHERE '.$id_field.' IN ('.implode(',', $category_ids).')';
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_structure.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/admin/index.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/admin/index.php	(.../index.php)	(revision 12127)
+++ branches/5.1.x/admin/index.php	(.../index.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: index.php 11992 2009-07-24 23:41:22Z dmitrya $
+* @version	$Id: index.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -15,19 +15,9 @@
 
 	define('ADMIN', 1);
 	define('FULL_PATH', realpath(dirname(__FILE__).'/..') );
-	if (!file_exists(FULL_PATH.'/core/kernel/application.php')) {
-		die('Please re-checkout _inportal_kernel4 cvs module into the root directory ('.FULL_PATH.') and remove kernel/kernel4 folder. Make sure to checkout correct branch (RC or HEAD).');
-	}
 
-	include_once(FULL_PATH.'/core/kernel/startup.php');
+	include_once(FULL_PATH . '/core/kernel/startup.php');
 
-	if (DIRECTORY_SEPARATOR != '\\') {
-		// force user to remove write permissions for important files (Linux only)
-		if (check_write_permissions(FULL_PATH.'/config.php') || check_write_permissions(FULL_PATH)) {
-			die('<br/><br/><center><font color="red">It\'s not safe to run with write permissions (777) on "/config.php" file and root folder of In-Portal installation!<br/><br/>Please change permissions from 777 to 775 (or 755) and try again!</font></center>');
-		}
-	}
-
 	$application =& kApplication::Instance();
 	$application->Init();
 	$application->Run();
@@ -39,19 +29,4 @@
 	{
 	    list($usec, $sec) = explode(" ", microtime());
 	    return ((float)$usec + (float)$sec);
-	}
-
-	//update_memory_check_script();
-
-	function update_memory_check_script() {
-		$files = get_included_files();
-		$script = '$files = Array('."\n";
-		foreach ($files as $file_name) {
-			$script .= "\t\t'".str_replace(FULL_PATH, '', $file_name)."',\n";
-		}
-		$script .= ");\n";
-		echo "<pre>";
-		echo $script;
-		echo "</pre>";
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_spelling_dictionary.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_users_settings.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/themes/template_edit.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/themes/template_edit.tpl	(.../template_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/themes/template_edit.tpl	(.../template_edit.tpl)	(revision 12657)
@@ -15,10 +15,19 @@
 						}
 					) );
 
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('theme-file', 'OnGoBack');
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'cancel',
+						'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+						function() {
+							<inp2:m_if check="adm_UsePopups">
+								window_close();
+							<inp2:m_else/>
+								submit_event('theme-file', 'OnGoBack');
+							</inp2:m_if>
 						}
-				 ) );
+					)
+				);
 
 				a_toolbar.Render();
 			</script>
@@ -39,7 +48,13 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="FileName" title="la_fld_FileName"/>
 		<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="BlockPosition" title="la_fld_BlockPosition"/>
-		<inp2:m_RenderElement name="inp_edit_codepress" prefix="theme-file" field="FileContents" title="la_fld_FileContents"/>
+
+		<inp2:m_if check="adm_UsePopups">
+			<inp2:m_RenderElement name="inp_edit_codepress" prefix="theme-file" field="FileContents" title="la_fld_FileContents"/>
+		<inp2:m_else/>
+			<inp2:m_RenderElement name="inp_edit_codepress" prefix="theme-file" field="FileContents" title="la_fld_FileContents" style="width: 100%; height: 500px;"/>
+		</inp2:m_if>
+
 		<!--<inp2:m_RenderElement name="inp_edit_filler" control_options="{height: 8}"/>-->
 	</table>
 </div>
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_agent.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/general/libchart/classes/view/caption/Caption.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/caption/Caption.php	(.../Caption.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/caption/Caption.php	(.../Caption.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * Caption.
 	 *
@@ -108,5 +110,4 @@
 		public function setColorSet($colorSet) {
 			$this->colorSet = $colorSet;
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_primary_theme_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/itemicons/icon16_theme_primary.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_visits.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/kernel/utility/debugger/debugger_responce.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/utility/debugger/debugger_responce.php	(.../debugger_responce.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/utility/debugger/debugger_responce.php	(.../debugger_responce.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debugger_responce.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: debugger_responce.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -17,7 +17,13 @@
 	define('FULL_PATH', realpath(dirname(__FILE__).'/../../../..') );
 
 	$sid = $_GET['sid'];
-	$path = isset($_GET['path']) ? $_GET['path'] : '/kernel/cache';
+	$path = isset($_GET['path']) ? $_GET['path'] : '/system/cache';
+
+	if ((strpos($path, '../') !== false) || (trim($path) !== $path)) {
+		// when relative paths or special chars are found template names from url, then it's hacking attempt
+		exit;
+	}
+
 	if (!preg_match('/^@([\d]+)@$/', $sid)) exit;
 
 	$debug_file = FULL_PATH.$path.'/debug_'.$sid.'.txt';
Index: branches/5.1.x/core/admin_templates/img/icons/icon46_settings_custom.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_shipping.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_review_f2.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/admin_templates/img/toolbar/tool_new_language_f3.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/general/libchart/classes/view/color/Palette.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/general/libchart/classes/view/color/Palette.php	(.../Palette.php)	(revision 12127)
+++ branches/5.1.x/core/units/general/libchart/classes/view/color/Palette.php	(.../Palette.php)	(revision 12657)
@@ -17,6 +17,8 @@
 	 *
 	 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	/**
 	 * Color palette shared by all chart types.
 	 *
@@ -106,5 +108,4 @@
 				new LibchartColor(93, 129, 1)
 			), 0.7);
 		}
-	}
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/img/icons/icon24_link_editor.gif
===================================================================
diff -u -N -r12127 -r12657
Binary files differ
Index: branches/5.1.x/core/units/files/files_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/files/files_config.php	(.../files_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/files/files_config.php	(.../files_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: files_config.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: files_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 	$config = Array (
 		'Prefix' => '#file',
 		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
@@ -83,14 +85,12 @@
 
 		'Grids' => Array (
 			'Default' => Array (
-				'Icons' => Array (1 => 'icon16_file.gif', 0 => 'icon16_file_disabled.gif'),
+				'Icons' => Array (1 => 'icon16_item.png', 0 => 'icon16_disabled.png'),
 				'Fields' => Array(
 					'FileId' => Array ('title' => 'la_col_Id' , 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
 					'FileName' => Array ('title' => 'la_col_FileName', 'filter_block' => 'grid_like_filter'),
 					'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
 				),
 			),
 		),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/js/uploader/uploader.js
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 12657)
@@ -207,7 +207,7 @@
 		this.swf.addVariable('debugEnabled', escape('true')); // flash var
 	}
 
-	if (this.params.buttonPlaceholderId === false) {
+	if (this.params.buttonPlaceholderId === false || !UploadsManager.useTransparency) {
 		// only write flash, when button placeholder is not used
 		this.swf.write(holder);
 		this.flash = document.getElementById(this.flash_id);
@@ -234,7 +234,7 @@
 
 Uploader.prototype.moveOutside = function() {
 	// move flash outside scroll_container, but keeps it's position on screen
-	if (!UploadsManager.useTransparency) {
+	if (!UploadsManager.useTransparency || this._moved) {
 		// moving only needed when transparency us used (e.g. in admin)
 		return ;
 	}
@@ -364,7 +364,7 @@
 	this._prepareFiles();
 
 	// sync position of all uploaders below current, because file queue height change will not affect their positions
-	UploadsManager.iterate('syncBrowseButton');
+	UploadsManager.iterate('syncBrowseButton', 0);
 }
 
 Uploader.prototype.removeFile = function (file) {
Index: branches/5.1.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 12127)
+++ branches/5.1.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 11933 2009-07-19 13:18:46Z alex $
+* @version	$Id: db_event_handler.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,6 +12,8 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	define('EH_CUSTOM_PROCESSING_BEFORE',1);
 	define('EH_CUSTOM_PROCESSING_AFTER',2);
 
@@ -112,6 +114,7 @@
 			$permissions = Array(
 									'OnLoad'				=>	Array('self' => 'view', 'subitem' => 'view'),
 									'OnItemBuild'			=>	Array('self' => 'view', 'subitem' => 'view'),
+									'OnSuggestValues'		=>	Array('self' => 'view', 'subitem' => 'view'),
 
 									'OnBuild'				=>	Array('self' => true),
 
@@ -267,9 +270,17 @@
 
 			$ids = $event->getEventParam('ids');
 			if (isset($direct_ids) || ($ids !== false)) {
-				// save ids directly if they given
-				$this->Application->StoreVar($session_name, implode(',', $direct_ids ? $direct_ids : $ids));
-				return $direct_ids ? $direct_ids : $ids;
+				// save ids directly if they given + reset array indexes
+				$resulting_ids = $direct_ids ? array_values($direct_ids) : ($ids ? array_values($ids) : false);
+				if ($resulting_ids) {
+					$this->Application->SetVar($event->getPrefixSpecial() . '_selected_ids', implode(',', $resulting_ids));
+					$this->Application->LinkVar($event->getPrefixSpecial() . '_selected_ids', $session_name);
+					$this->Application->SetVar($event->getPrefixSpecial() . '_id', $resulting_ids[0]);
+
+					return $resulting_ids;
+				}
+
+				return Array ();
 			}
 
 			$ret = Array();
@@ -298,7 +309,7 @@
 			$ret = array_unique(array_merge($ret, $ids));
 
 			$this->Application->SetVar($event->getPrefixSpecial().'_selected_ids', implode(',',$ret));
-			$this->Application->LinkVar($event->getPrefixSpecial().'_selected_ids', $session_name);
+			$this->Application->LinkVar($event->getPrefixSpecial().'_selected_ids', $session_name, '', !$ret); // optional when IDs are missing
 
 			// This is critical - otherwise getPassedID will return last ID stored in session! (not exactly true)
 			// this smells... needs to be refactored
@@ -465,6 +476,8 @@
 			$this->Application->SetVar('t', $error_template);
 			$this->Application->SetVar('m_cat_id', $themes_helper->getPageByTemplate($error_template));
 
+			// in case if missing item is recalled first from event (not from template)
+			$this->Application->InitParser();
 			$this->Application->HTML = $this->Application->ParseBlock( Array ('name' => $error_template) );
 			$this->Application->Done();
 			exit;
@@ -499,7 +512,10 @@
 					$this->LoadItem($event);
 
 					$status_checked = true;
-					if ($user_id != -1 && !$this->Application->IsAdmin() && !$this->checkItemStatus($event)) {
+					$editing_mode = defined('EDITING_MODE') ? EDITING_MODE : false;
+
+					if ($user_id != -1 && !$this->Application->IsAdmin() && !($editing_mode || $this->checkItemStatus($event))) {
+						// non-root user AND on front-end AND (not editing mode || incorrect status)
 						$perm_status = false;
 					}
 				}
@@ -699,7 +715,7 @@
 
 			$object =& $event->getObject();
 			$object->SetPerPage($per_page);
-			$this->Application->StoreVarDefault($event->getPrefixSpecial().'_Page', 1);
+			$this->Application->StoreVarDefault($event->getPrefixSpecial().'_Page', 1, true); // true for optional
 
 			$page = $this->Application->GetVar($event->getPrefixSpecial().'_Page');
 			if (!$page) {
@@ -1144,27 +1160,25 @@
 			$object =& $event->getObject( Array('skip_autoload' => true) );
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-			if($items_info)
-			{
-				foreach($items_info as $id => $field_values)
-				{
+			if ($items_info) {
+				foreach ($items_info as $id => $field_values) {
 					$object->Load($id);
 	 				$object->SetFieldsFromHash($field_values);
 	 				$this->customProcessing($event, 'before');
-					if( $object->Update($id) )
-					{
+
+					if ( $object->Update($id) ) {
 						$this->customProcessing($event, 'after');
-						$event->status=erSUCCESS;
+						$event->status = erSUCCESS;
 					}
-					else
-					{
-						$event->status=erFAIL;
-						$event->redirect=false;
+					else {
+						$event->status = erFAIL;
+						$event->redirect = false;
 						break;
 					}
 				}
 			}
-			$event->redirect_params = Array('opener'=>'u');
+
+			$event->SetRedirectParam('opener', 'u');
 		}
 
 		/**
@@ -2304,7 +2318,7 @@
 				return ;
 			}
 
-			$tmp_path = defined('WRITEABLE') ? WRITEABLE.'/tmp/' : FULL_PATH.'/kernel/cache/';
+			$tmp_path = WRITEABLE . '/tmp/';
 			$fname = $value['name'];
 			$id = $this->Application->GetVar('id');
 			if ($id) {
@@ -2385,18 +2399,28 @@
 		 */
 		function OnViewFile(&$event)
 		{
-			if (strpos($this->Application->GetVar('file'), '../') !== false) return ;
+			$file = $this->Application->GetVar('file');
+			if ((strpos($file, '../') !== false) || (trim($file) !== $file)) {
+				// when relative paths or special chars are found template names from url, then it's hacking attempt
+				return ;
+			}
+
 			if ($this->Application->GetVar('tmp')) {
-				$path = (defined('WRITEABLE') ? WRITEABLE.'/tmp/' : FULL_PATH.'/kernel/cache/').$this->Application->GetVar('id').'_'.$this->Application->GetVar('file');
+				$path = WRITEABLE . '/tmp/' . $this->Application->GetVar('id') . '_' . $this->Application->GetVar('file');
 			}
 			else {
 				$object =& $event->getObject(array('skip_autoload'=>true));
 				$options = $object->GetFieldOptions($this->Application->GetVar('field'));
 
-				$path = FULL_PATH.$options['upload_dir'].$this->Application->GetVar('file');
+				$path = FULL_PATH.$options['upload_dir'].$file;
 			}
 
 			$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
+
+			if (!file_exists($path)) {
+				exit;
+			}
+
 			$type = mime_content_type($path);
 
 			header('Content-Length: '.filesize($path));
@@ -2428,35 +2452,44 @@
 		 */
 		function OnSuggestValues(&$event)
 		{
-			$this->Application->XMLHeader();
+			if (!$this->Application->IsAdmin() || !$this->Application->LoggedIn()) {
+				// very careful here, because this event allows to
+				// view every object field -> limit only to logged-in admins
+				return ;
+			}
 
+			$event->status = erSTOP;
+
 			$field = $this->Application->GetVar('field');
 			$cur_value = $this->Application->GetVar('cur_value');
-			if (!$field || !$cur_value) {
-				exit;
+
+			$object =& $event->getObject();
+
+			if (!$field || !$cur_value || !array_key_exists($field, $object->Fields)) {
+				return ;
 			}
 
 			$limit = $this->Application->GetVar('limit');
 			if (!$limit) {
 				$limit = 20;
 			}
 
-			$object =& $event->getObject();
 			$sql = 'SELECT DISTINCT '.$field.'
 					FROM '.$object->TableName.'
 					WHERE '.$field.' LIKE '.$this->Conn->qstr($cur_value.'%').'
 					ORDER BY '.$field.'
 					LIMIT 0,' . $limit;
-
 			$data = $this->Conn->GetCol($sql);
 
+			$this->Application->XMLHeader();
+
 			echo '<suggestions>';
+
 			foreach ($data as $item) {
 				echo '<item>' . htmlspecialchars($item) . '</item>';
 			}
-			echo '</suggestions>';
 
-			$event->status = erSTOP;
+			echo '</suggestions>';
 		}
 
 		/**
@@ -2495,7 +2528,4 @@
 			// abstract, for hooking
 		}
 
-	}
-
-
-?>
\ No newline at end of file
+	}
\ No newline at end of file
Index: branches/5.1.x/core/units/form_fields/form_fields_config.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/form_fields/form_fields_config.php	(.../form_fields_config.php)	(revision 12127)
+++ branches/5.1.x/core/units/form_fields/form_fields_config.php	(.../form_fields_config.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_fields_config.php 11906 2009-07-18 00:11:13Z dmitrya $
+* @version	$Id: form_fields_config.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,7 +12,9 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
-$config	=	Array(
+defined('FULL_PATH') or die('restricted access!');
+
+	$config =	Array(
 					'Prefix'			=>	'formflds',
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
@@ -62,7 +64,11 @@
 			            'FieldLabel' => Array('type' => 'string', 'required' => 1, 'default' => null),
 			            'Heading' => Array('type' => 'string', 'default' => null),
 			            'Prompt' => Array('type' => 'string', 'default' => null, 'required' => 1),
-			            'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null '=> 1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label')),
+			            'ElementType' => Array(
+			            	'type' => 'string',
+			            	'formatter' => 'kOptionsFormatter', 'options' => Array ('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label'), 'use_phrases' => 1,
+			            	'required' => 1, 'not_null' => 1, 'default' => '',
+			            ),
 			            'ValueList' => Array('type' => 'string','default' => null),
 			            'Priority' => Array('type' => 'int','not_null' => 1, 'default' => 0),
 			            'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
@@ -80,18 +86,16 @@
 					),
 					'Grids'	=> Array(
 						'Default'		=>	Array(
-							'Icons' => Array('default'=>'icon16_custom.gif'),
+							'Icons' => Array('default'=>'icon16_item.png'),
 							'Fields' => Array(
-								'FormFieldId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-								'FieldName' => Array( 'title'=>'la_prompt_FieldName', 'filter_block' => 'grid_like_filter'),
-								'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'label_grid_data_td', 'filter_block' => 'grid_like_filter'),
-								'Priority' => Array('title' => 'la_prompt_Priority', 'filter_block' => 'grid_range_filter'),
+								'FormFieldId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60 ),
+								'FieldName' => Array( 'title'=>'la_prompt_FieldName', 'filter_block' => 'grid_like_filter', 'width' => 100 ),
+								'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'label_grid_data_td', 'filter_block' => 'grid_like_filter', 'width' => 150 ),
+								'Priority' => Array('title' => 'la_prompt_Priority', 'filter_block' => 'grid_range_filter', 'width' => 80 ),
 								'ElementType' => Array('title' => 'la_prompt_ElementType', 'filter_block' => 'grid_options_filter'),
 								'Required' => Array('title' => 'la_prompt_Required', 'filter_block' => 'grid_options_filter'),
-								'DisplayInGrid' => Array('title' => 'la_prompt_DisplayInGrid', 'filter_block' => 'grid_options_filter'),
+								'DisplayInGrid' => Array('title' => 'la_prompt_DisplayInGrid', 'filter_block' => 'grid_options_filter', 'width' => 150 ),
 							),
 						),
 					),
-	);
-
-?>
\ No newline at end of file
+	);
\ No newline at end of file
Index: branches/5.1.x/core/admin_templates/regional/languages_list.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/regional/languages_list.tpl	(.../languages_list.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/regional/languages_list.tpl	(.../languages_list.tpl)	(revision 12657)
@@ -15,7 +15,7 @@
   			}
 
   			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_language', '<inp2:m_phrase label="la_ToolTip_NewLanguage" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewLanguage" escape="1"/>::<inp2:m_phrase label="la_Add" escape="1"/>',
 						function() {
 							std_precreate_item('lang', 'regional/languages_edit')
 						} ) );
@@ -29,18 +29,18 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
-				a_toolbar.AddButton( new ToolBarButton('primary_language', '<inp2:m_phrase label="la_ToolTip_SetPrimaryLanguage" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_SetPrimary" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
 							submit_event('lang','OnSetPrimary');
 						}
 				 ) );
 
 
-				a_toolbar.AddButton( new ToolBarButton('import_language', '<inp2:m_phrase label="la_ToolTip_ImportLanguage" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Import" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('import', '<inp2:m_phrase label="la_ToolTi