Index: releases/5.2.0-B2/install.php
===================================================================
--- releases/5.2.0-B2/install.php	(revision 15202)
+++ releases/5.2.0-B2/install.php	(nonexistent)
@@ -1,52 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @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.org/license for copyright notices and details.
-*/
-	$module_folder = 'modules/in-news';
-
-	if (!defined('IS_INSTALL')) {
-		// separate module install
-		define('IS_INSTALL', 1);
-		define('ADMIN', 1);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
-
-		include_once(FULL_PATH . '/core/kernel/startup.php');
-		require_once FULL_PATH . '/core/install/install_toolkit.php';
-
-		$toolkit = new kInstallToolkit();
-	}
-	else {
-		// install, using installation wizard
-		$toolkit =& $this->toolkit;
-		/* @var $toolkit kInstallToolkit */
-	}
-
-	$application =& kApplication::Instance();
-	$application->Init();
-
-	if ($application->RecallVar('user_id') != USER_ROOT) {
-		die('restricted access!');
-	}
-
-	$category =& $toolkit->createModuleCategory('News', 'News Articles', '#in-news/section_design#', 'in-news/img/menu_articles.gif');
-
-	$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql');
-	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{NewsCatId}', $category->GetID());
-	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
-
-	$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID());
-
-	$toolkit->linkCustomFields(basename($module_folder), 'n', 2); // to create Custom Fields for News
-	$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
-	$toolkit->setModuleItemTemplate($category, 'n', '#in-news/item_design#');
-
-	$toolkit->finalizeModuleInstall($module_folder, true);
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.4
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: releases/5.2.0-B2/install/.htaccess
===================================================================
--- releases/5.2.0-B2/install/.htaccess	(revision 15202)
+++ releases/5.2.0-B2/install/.htaccess	(nonexistent)
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/.htaccess
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/module_info.xml
===================================================================
--- releases/5.2.0-B2/install/module_info.xml	(revision 15202)
+++ releases/5.2.0-B2/install/module_info.xml	(nonexistent)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module_info>
-	<name>In-News</name>
-	<description>News Management</description>
-	<image>modules/in-news/install/img/icon_news_management.gif</image>
-</module_info>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/module_info.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/install_schema.sql
===================================================================
--- releases/5.2.0-B2/install/install_schema.sql	(revision 15202)
+++ releases/5.2.0-B2/install/install_schema.sql	(nonexistent)
@@ -1,86 +0,0 @@
-CREATE TABLE News (
-  NewsId int(11) NOT NULL AUTO_INCREMENT,
-  Title varchar(255) NOT NULL DEFAULT '',
-  l1_Title varchar(255) NOT NULL DEFAULT '',
-  l2_Title varchar(255) NOT NULL DEFAULT '',
-  l3_Title varchar(255) NOT NULL DEFAULT '',
-  l4_Title varchar(255) NOT NULL DEFAULT '',
-  l5_Title varchar(255) NOT NULL DEFAULT '',
-  AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1',
-  Excerpt text,
-  l1_Excerpt text,
-  l2_Excerpt text,
-  l3_Excerpt text,
-  l4_Excerpt text,
-  l5_Excerpt text,
-  Author varchar(255) NOT NULL DEFAULT '',
-  Body text,
-  l1_Body text,
-  l2_Body text,
-  l3_Body text,
-  l4_Body text,
-  l5_Body text,
-  MetaKeywords varchar(255) DEFAULT NULL,
-  MetaDescription text,
-  CreatedOn int(11) DEFAULT NULL,
-  TextFormat int(11) NOT NULL DEFAULT '0',
-  EndOn int(11) DEFAULT NULL,
-  Hits double(20,6) NOT NULL DEFAULT '0.000000',
-  CachedRating varchar(10) DEFAULT '0',
-  CachedVotesQty int(11) NOT NULL DEFAULT '0',
-  CreatedById int(11) DEFAULT NULL,
-  Priority int(11) NOT NULL DEFAULT '0',
-  `Status` tinyint(4) NOT NULL DEFAULT '2',
-  EditorsPick tinyint(4) NOT NULL DEFAULT '0',
-  LeadStory tinyint(4) NOT NULL DEFAULT '0',
-  LeadCatStory tinyint(4) NOT NULL DEFAULT '0',
-  ResourceId int(11) DEFAULT NULL,
-  CachedReviewsQty int(11) NOT NULL DEFAULT '0',
-  StartDate int(11) DEFAULT NULL,
-  NewItem tinyint(4) NOT NULL DEFAULT '2',
-  PopItem tinyint(4) NOT NULL DEFAULT '2',
-  HotItem tinyint(4) NOT NULL DEFAULT '2',
-  Archived int(11) NOT NULL DEFAULT '0',
-  Modified int(11) DEFAULT NULL,
-  ModifiedById int(11) DEFAULT NULL,
-  OrgId int(11) DEFAULT NULL,
-  PRIMARY KEY (NewsId),
-  UNIQUE KEY ResourceId (ResourceId),
-  KEY Title (Title),
-  KEY l1_Title (l1_Title),
-  KEY l2_Title (l2_Title),
-  KEY l3_Title (l3_Title),
-  KEY l4_Title (l4_Title),
-  KEY l5_Title (l5_Title),
-  KEY Excerpt (Excerpt(5)),
-  KEY l1_Excerpt (l1_Excerpt(5)),
-  KEY l2_Excerpt (l2_Excerpt(5)),
-  KEY l3_Excerpt (l3_Excerpt(5)),
-  KEY l4_Excerpt (l4_Excerpt(5)),
-  KEY l5_Excerpt (l5_Excerpt(5)),
-  KEY Body (Body(5)),
-  KEY l1_Body (l1_Body(5)),
-  KEY l2_Body (l2_Body(5)),
-  KEY l3_Body (l3_Body(5)),
-  KEY l4_Body (l4_Body(5)),
-  KEY l5_Body (l5_Body(5)),
-  KEY CreatedOn (CreatedOn),
-  KEY EndOn (EndOn),
-  KEY Priority (Priority),
-  KEY `Status` (`Status`),
-  KEY EditorsPick (EditorsPick),
-  KEY Hits (Hits),
-  KEY Modified (Modified),
-  KEY NewItem (NewItem),
-  KEY PopItem (PopItem),
-  KEY HotItem (HotItem),
-  KEY StartDate (StartDate),
-  KEY Archived (Archived)
-);
-
-CREATE TABLE NewsCustomData (
-  CustomDataId int(11) NOT NULL auto_increment,
-  ResourceId int(10) unsigned NOT NULL default '0',
-  KEY ResourceId (ResourceId),
-  PRIMARY KEY  (CustomDataId)
-);
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/install_schema.sql
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.2
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/upgrades.sql
===================================================================
--- releases/5.2.0-B2/install/upgrades.sql	(revision 15202)
+++ releases/5.2.0-B2/install/upgrades.sql	(nonexistent)
@@ -1,130 +0,0 @@
-# ===== v 4.3.9 =====
-
-INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1');
-
-# ===== v 5.0.0 =====
-ALTER TABLE News ADD INDEX (StartDate), ADD INDEX (Archived);
-
-UPDATE Category SET Template = '/in-news/designs/section' WHERE Template = 'innews/index';
-UPDATE Category SET CachedTemplate = '/in-news/designs/section' WHERE CachedTemplate = 'innews/index';
-
-UPDATE ConfigurationValues SET VariableValue = '/in-news/designs/section' WHERE VariableName = 'n_CategoryTemplate';
-UPDATE ConfigurationValues SET VariableValue = 'in-news/designs/detail' WHERE VariableName = 'n_ItemTemplate';
-
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:articles.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:setting_folder.view', 11, 1, 1, 0);
-DELETE FROM Permissions WHERE Permission LIKE 'in-news:innews_general.%';
-
-UPDATE Phrase SET Module = 'In-News' WHERE ((Phrase LIKE '%Article%' OR Phrase LIKE '%News%') AND (Module = 'Core') AND Phrase NOT IN ('la_ToolTip_NewSearchConfig', 'la_tooltip_newstylesheet'));
-
-UPDATE Phrase SET Module = 'In-News' WHERE Phrase = 'la_title_In-News';
-
-# ===== v 5.0.1 =====
-UPDATE ConfigurationValues SET VariableValue = 'in-news/articles/article_detail' WHERE VariableName = 'n_ItemTemplate';
-
-UPDATE ConfigurationAdmin
-SET ValueList = 'ReviewText=la_opt_CommentText,CreatedOn=la_opt_CreatedOn'
-WHERE VariableName IN ('News_SortReviews', 'News_SortReviews2');
-
-UPDATE ConfigurationAdmin SET ValueList = 'ASC=la_common_Ascending,DESC=la_common_Descending'
-WHERE VariableName IN ('News_SortReviewsOrder', 'News_SortReviewsOrder2');
-
-UPDATE ConfigurationAdmin
-SET ValueList = '1=la_opt_Sec,60=la_opt_Min,3600=la_opt_Hour,86400=la_opt_Day,604800=la_opt_Week,2419200=la_opt_Month,29030400=la_opt_Year'
-WHERE VariableName IN ('News_ReviewDelay_Interval', 'News_RatingDelay_Interval');
-
-UPDATE CustomField SET FieldLabel = 'la_fld_RssSource', Prompt = 'la_fld_RssSource' WHERE FieldName = 'RssSource';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssDefaultExpiration', Prompt = 'la_fld_RssDefaultExpiration' WHERE FieldName = 'RssDefaultExpiration';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssUpdateInterval', Prompt = 'la_fld_RssUpdateInterval' WHERE FieldName = 'RssUpdateInterval';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssExpireInterval', Prompt = 'la_fld_RssExpireInterval' WHERE FieldName = 'RssExpireInterval';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssDeleteExpired', Prompt = 'la_fld_RssDeleteExpired' WHERE FieldName = 'RssDeleteExpired';
-
-UPDATE CustomField SET FieldLabel = 'la_fld_RssLastExpired', Prompt = 'la_fld_RssLastExpired' WHERE FieldName = 'RssLastExpired';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssDefaultExpirationType', Prompt = 'la_fld_RssDefaultExpirationType' WHERE FieldName = 'RssDefaultExpirationType';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssExpireIntervalType', Prompt = 'la_fld_RssExpireIntervalType' WHERE FieldName = 'RssExpireIntervalType';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssUpdateIntervalType', Prompt = 'la_fld_RssUpdateIntervalType' WHERE FieldName = 'RssUpdateIntervalType';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssLastUpdated', Prompt = 'la_fld_RssLastUpdated' WHERE FieldName = 'RssLastUpdated';
-UPDATE CustomField SET FieldLabel = 'la_fld_RssArticleCRC', Prompt = 'la_fld_RssArticleCRC' WHERE FieldName = 'RssArticleCRC';
-UPDATE CustomField SET FieldLabel = 'la_fld_cust_n_ItemTemplate', Prompt = 'la_fld_cust_n_ItemTemplate' WHERE FieldName = 'n_ItemTemplate';
-
-INSERT INTO Events VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, NULL, 'In-News', 'la_event_article.review.add.pending', 1);
-
-UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('News_ReviewDelay_Value', 'News_RatingDelay_Value');
-
-# ===== v 5.0.2-B1 =====
-ALTER TABLE News
-	CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL,
-	CHANGE StartDate StartDate INT(11) NULL DEFAULT NULL,
-	CHANGE Modified Modified INT(11) NULL DEFAULT NULL;
-
-# ===== v 5.0.2-B2 =====
-
-# ===== v 5.0.2-RC1 =====
-
-# ===== v 5.0.2 =====
-
-# ===== v 5.0.3-B1 =====
-
-# ===== v 5.0.3-B2 =====
-
-# ===== v 5.0.3-RC1 =====
-
-# ===== v 5.0.3 =====
-
-# ===== v 5.0.4-B1 =====
-
-# ===== v 5.0.4-B2 =====
-
-# ===== v 5.0.4 =====
-
-# ===== v 5.1.0-B1 =====
-UPDATE Modules SET Path = 'modules/in-news/' WHERE `Name` = 'In-News';
-DELETE FROM ConfigurationValues WHERE VariableName IN (
-	'Article_Root', 'News_PopCount', 'News_ArticleSort', 'News_CatSort', 'News_ShowMulti',
-	'News_Admin_Notice_New', 'News_Admin_Notice_Modify', 'News_Admin_Notice_Suggest',
-	'News_User_Notice_New', 'News_User_Notice_Approve', 'News_User_Notice_Deny',
-	'News_User_Notice_Modify', 'News_User_Notice_Modify_Approve', 'News_User_Notice_Modify_Deny'
-);
-
-DELETE FROM Permissions WHERE Permission LIKE 'in-news:configuration_email%';
-
-# ===== v 5.1.0-RC1 =====
-
-# ===== v 5.1.0 =====
-
-# ===== v 5.1.1-B1 =====
-ALTER TABLE News
-	CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL ,
-	CHANGE ModifiedById ModifiedById INT(11) NULL DEFAULT NULL;
-
-# ===== v 5.1.1-RC1 =====
-
-# ===== v 5.1.1 =====
-
-# ===== v 5.1.2-B1 =====
-
-# ===== v 5.1.2-RC1 =====
-
-# ===== v 5.1.2 =====
-
-# ===== v 5.1.3-B1 =====
-
-# ===== v 5.1.3-RC1 =====
-UPDATE ConfigurationValues
-SET VariableValue = 'in-news/articles/article_detail'
-WHERE VariableName = 'n_ItemTemplate' AND VariableValue = 'in-news/designs/detail';
-
-# ===== v 5.1.3-RC2 =====
-
-# ===== v 5.1.3 =====
-UPDATE Phrase
-SET `Module` = 'Core'
-WHERE PhraseKey = 'LA_FLD_STARTDATE';
-
-# ===== v 5.2.0-B1 =====
-DELETE FROM SystemSettings
-WHERE VariableName IN ('News_Highlight_OpenTag', 'News_Highlight_CloseTag');
-
-# ===== v 5.2.0-B2 =====
-UPDATE News main_table
-SET main_table.CachedReviewsQty = (SELECT COUNT(*) FROM <%TABLE_PREFIX%>CatalogReviews review_table WHERE review_table.ItemId = main_table.ResourceId);

Property changes on: releases/5.2.0-B2/install/upgrades.sql
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.8
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/english.lang
===================================================================
--- releases/5.2.0-B2/install/english.lang	(revision 15202)
+++ releases/5.2.0-B2/install/english.lang	(nonexistent)
@@ -1,109 +0,0 @@
-<LANGUAGES Version="4">
-	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
-		<PHRASES>
-			<PHRASE Label="la_Article_Author" Module="In-News" Type="1">QXV0aG9y</PHRASE>
-			<PHRASE Label="la_Article_Date" Module="In-News" Type="1">RGF0ZQ==</PHRASE>
-			<PHRASE Label="la_Article_Excerpt" Module="In-News" Type="1">QXJ0aWNsZSBFeGNlcnB0</PHRASE>
-			<PHRASE Label="la_Article_Hits" Module="In-News" Type="1">SGl0cw==</PHRASE>
-			<PHRASE Label="la_Article_Rating" Module="In-News" Type="1">UmF0aW5n</PHRASE>
-			<PHRASE Label="la_Article_Title" Module="In-News" Type="1">QXJ0aWNsZSBUaXRsZQ==</PHRASE>
-			<PHRASE Label="la_fld_Author" Module="In-News" Type="1" Column="QXV0aG9y">QXV0aG9y</PHRASE>
-			<PHRASE Label="la_fld_Body" Module="In-News" Type="1">QXJ0aWNsZSBCb2R5</PHRASE>
-			<PHRASE Label="la_fld_cust_n_ItemTemplate" Module="In-News" Type="1">TmV3cyBJdGVtIFRlbXBsYXRl</PHRASE>
-			<PHRASE Label="la_fld_EndOn" Module="In-News" Type="1" Column="QXJjaGl2YXRpb24gRGF0ZQ==">QXJjaGl2YXRpb24gRGF0ZQ==</PHRASE>
-			<PHRASE Label="la_fld_Excerpt" Module="In-News" Type="1">QXJ0aWNsZSBFeGNlcnB0</PHRASE>
-			<PHRASE Label="la_fld_LeadCatStory" Module="In-News" Type="1" Column="U2VjdGlvbiBMZWFk">U2VjdGlvbiBMZWFkIFN0b3J5</PHRASE>
-			<PHRASE Label="la_fld_LeadStory" Module="In-News" Type="1" Column="U2l0ZSBMZWFk">U2l0ZSBMZWFkIFN0b3J5</PHRASE>
-			<PHRASE Label="la_fld_News_MaxHotNumber" Module="In-News" Type="1">TWF4aW11bSBudW1iZXIgb2YgSE9UIGFydGljbGVz</PHRASE>
-			<PHRASE Label="la_fld_News_MinPopRating" Module="In-News" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A=</PHRASE>
-			<PHRASE Label="la_fld_News_MinPopVotes" Module="In-News" Type="1">TWluaW11bSBudW1iZXIgb2Ygdm90ZXMgdG8gY29uc2lkZXIgYXJ0aWNsZSBQT1A=</PHRASE>
-			<PHRASE Label="la_fld_RssArticleCRC" Module="In-News" Type="1">UlNTIEFydGljbGUgQ1JDMzI=</PHRASE>
-			<PHRASE Label="la_fld_RssDefaultExpiration" Module="In-News" Type="1">RGVmYXVsdCBFeHBpcmF0aW9u</PHRASE>
-			<PHRASE Label="la_fld_RssDefaultExpirationType" Module="In-News" Type="1">RGVmYXVsdCBFeHBpcmF0aW9uIFR5cGU=</PHRASE>
-			<PHRASE Label="la_fld_RssDeleteExpired" Module="In-News" Type="1">RGVsZXRlIEV4cGlyZWQ=</PHRASE>
-			<PHRASE Label="la_fld_RssExpireInterval" Module="In-News" Type="1">RXhwaXJhdGlvbiBDaGVjayBJbnRlcnZhbA==</PHRASE>
-			<PHRASE Label="la_fld_RssExpireIntervalType" Module="In-News" Type="1">RXhwaXJhdGlvbiBJbnRlcnZhbCBUeXBl</PHRASE>
-			<PHRASE Label="la_fld_RssLastExpired" Module="In-News" Type="1">TGFzdCBFeHBpcmVkIE9u</PHRASE>
-			<PHRASE Label="la_fld_RssLastUpdated" Module="In-News" Type="1">TGFzdCBVcGRhdGVk</PHRASE>
-			<PHRASE Label="la_fld_RssOriginalURL" Module="In-News" Type="1">RmVlZCBPcmlnaW5hbCBVUkw=</PHRASE>
-			<PHRASE Label="la_fld_RssSource" Module="In-News" Type="1">U291cmNlIFVSTA==</PHRASE>
-			<PHRASE Label="la_fld_RssUpdateInterval" Module="In-News" Type="1">VXBkYXRlIEludGVydmFs</PHRASE>
-			<PHRASE Label="la_fld_RssUpdateIntervalType" Module="In-News" Type="1">VXBkYXRlIEludGVydmFsIFR5cGU=</PHRASE>
-			<PHRASE Label="la_In-news" Module="In-News" Type="1">SW4tTmV3cw==</PHRASE>
-			<PHRASE Label="la_ItemTab_News" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_news_daysarchive_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGRheXMgdG8gYXJjaGl2ZSBhcnRpY2xlcyBhdXRvbWF0aWNhbGx5</PHRASE>
-			<PHRASE Label="la_news_editorpicksabove_prompt" Module="In-News" Type="1">RGlzcGxheSBlZGl0b3IgUElDS3MgYWJvdmUgcmVndWxhciBhcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_news_newdays_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGRheXMgZm9yIGEgYXJ0aWNsZSB0byBiZSBORVc=</PHRASE>
-			<PHRASE Label="la_news_perpage_prompt" Module="In-News" Type="1">TnVtYmVyIG9mIGFydGljbGVzIHBlciBwYWdl</PHRASE>
-			<PHRASE Label="la_news_perpage_short_prompt" Module="In-News" Type="1">QXJ0aWNsZXMgUGVyIFBhZ2UgKFNob3J0bGlzdCk=</PHRASE>
-			<PHRASE Label="la_news_sortfield2_pompt" Module="In-News" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
-			<PHRASE Label="la_news_sortfield_pompt" Module="In-News" Type="1">T3JkZXIgYXJ0aWNsZXMgYnk=</PHRASE>
-			<PHRASE Label="la_news_sortreviews2_prompt" Module="In-News" Type="1">QW5kIHRoZW4gYnk=</PHRASE>
-			<PHRASE Label="la_news_sortreviews_prompt" Module="In-News" Type="1">U29ydCBDb21tZW50cyBieQ==</PHRASE>
-			<PHRASE Label="la_PermName_News.Add.Pending_desc" Module="In-News" Type="1">QWRkIFBlbmRpbmcgTmV3cw==</PHRASE>
-			<PHRASE Label="la_PermName_News.Add_desc" Module="In-News" Type="1">QWRkIE5ld3M=</PHRASE>
-			<PHRASE Label="la_PermName_News.Delete_desc" Module="In-News" Type="1">RGVsZXRlIE5ld3M=</PHRASE>
-			<PHRASE Label="la_PermName_News.Modify.Pending_desc" Module="In-News" Type="1">TW9kaWZ5IEFydGljbGUgUGVuZGluZw==</PHRASE>
-			<PHRASE Label="la_PermName_News.Modify_desc" Module="In-News" Type="1">TW9kaWZ5IE5ld3M=</PHRASE>
-			<PHRASE Label="la_PermName_News.Owner.Delete_desc" Module="In-News" Type="1">QXJ0aWNsZSBEZWxldGUgYnkgT3duZXI=</PHRASE>
-			<PHRASE Label="la_PermName_News.Owner.Modify.Pending_desc" Module="In-News" Type="1">QXJ0aWNsZSBNb2RpZnkgUGVuZGluZyBieSBPd25lcg==</PHRASE>
-			<PHRASE Label="la_PermName_News.Owner.Modify_desc" Module="In-News" Type="1">QXJ0aWNsZSBNb2RpZnkgYnkgT3duZXI=</PHRASE>
-			<PHRASE Label="la_PermName_News.Rate_desc" Module="In-News" Type="1">UmF0ZSBOZXdz</PHRASE>
-			<PHRASE Label="la_PermName_News.Review.Pending_desc" Module="In-News" Type="1">UmV2aWV3IE5ld3MgUGVuZGluZw==</PHRASE>
-			<PHRASE Label="la_PermName_News.Review_desc" Module="In-News" Type="1">Q29tbWVudCBBcnRpY2xl</PHRASE>
-			<PHRASE Label="la_PermName_News.View_desc" Module="In-News" Type="1">VmlldyBOZXdz</PHRASE>
-			<PHRASE Label="la_prompt_ActiveArticles" Module="In-News" Type="1">QWN0aXZlIEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_ArticleAverageRating" Module="In-News" Type="1">QXZlcmFnZSBSYXRpbmcgb2YgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_prompt_ArticleReviews" Module="In-News" Type="1">VG90YWwgQXJ0aWNsZSBDb21tZW50cw==</PHRASE>
-			<PHRASE Label="la_prompt_ArticlesActive" Module="In-News" Type="1">QWN0aXZlIEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_ArticlesArchived" Module="In-News" Type="1">QXJjaGl2ZWQgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_prompt_ArticlesPending" Module="In-News" Type="1">UGVuZGluZyBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_prompt_ArticlesTotal" Module="In-News" Type="1">VG90YWwgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_prompt_CategoryLeadStoryArticles" Module="In-News" Type="1">U2VjdGlvbiBMZWFkIFN0b3J5IEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_DisabledArticles" Module="In-News" Type="1">RGlzYWJsZWQgQXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_prompt_EditorsPickArticles" Module="In-News" Type="1">RWRpdG9yJ3MgUGljayBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_prompt_HotArticles" Module="In-News" Type="1">SG90IEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_LastArticleUpdate" Module="In-News" Type="1">TGFzdCBVcGRhdGVkIEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_prompt_LeadStoryArticles" Module="In-News" Type="1">TGVhZCBTdG9yeSBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_prompt_MaxHitsArticles" Module="In-News" Type="1">TWF4aW11bSBIaXRzIG9mIGFuIEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_prompt_MaxVotesArticles" Module="In-News" Type="1">TWF4aW11bSBWb3RlcyBvZiBhbiBBcnRpY2xl</PHRASE>
-			<PHRASE Label="la_prompt_NewArticles" Module="In-News" Type="1">TmV3IEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_prompt_NewestArticleDate" Module="In-News" Type="1">TmV3ZXN0IEFydGljbGUgRGF0ZQ==</PHRASE>
-			<PHRASE Label="la_prompt_PopularArticles" Module="In-News" Type="1">UG9wdWxhciBBcnRpY2xlcw==</PHRASE>
-			<PHRASE Label="la_section_Article" Module="In-News" Type="1">QXJ0aWNsZQ==</PHRASE>
-			<PHRASE Label="la_section_RssExpiration" Module="In-News" Type="1">UlNTIEZlZWQgQXJ0aWNsZSBFeHBpcmF0aW9u</PHRASE>
-			<PHRASE Label="la_section_RssProperties" Module="In-News" Type="1">UlNTIEZlZWQgUHJvcGVydGllcw==</PHRASE>
-			<PHRASE Label="la_tab_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_Text_Article" Module="In-News" Type="1">QXJ0aWNsZQ==</PHRASE>
-			<PHRASE Label="la_Text_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_title_AddingArticle" Module="In-News" Type="1">QWRkaW5nIEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_title_Articles" Module="In-News" Type="1">QXJ0aWNsZXM=</PHRASE>
-			<PHRASE Label="la_title_ArticlesExport" Module="In-News" Type="1">QXJ0aWNsZXMgRXhwb3J0</PHRASE>
-			<PHRASE Label="la_title_EditingArticle" Module="In-News" Type="1">RWRpdGluZyBBcnRpY2xl</PHRASE>
-			<PHRASE Label="la_title_ImportArticles" Module="In-News" Type="1">SW1wb3J0IEFydGljbGVz</PHRASE>
-			<PHRASE Label="la_title_In-News" Module="In-News" Type="1">TmV3cw==</PHRASE>
-			<PHRASE Label="la_title_NewArticle" Module="In-News" Type="1">TmV3IEFydGljbGU=</PHRASE>
-			<PHRASE Label="la_ToolTip_NewArticle" Module="In-News" Type="1">TmV3IEFydGljbGU=</PHRASE>
-		</PHRASES>
-		<EVENTS>
-			<EVENT MessageType="html" Event="NEWS.ADD" Type="0">U3ViamVjdDogWW91ciBOZXcgQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBBZGRlZAoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgQXJ0aWNsZSB0byBvdXIgd2Vic2l0ZSE8YnIvPjxici8+DQ1BcnRpY2xlIGRldGFpbHMgYXJlIGxpc3RlZCBiZWxvdzo8YnIvPjxici8+DQ1BcnRpY2xlIFRpdGxlOiA8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PGJyLz4NPGlucDI6bV9pZiBjaGVjaz0ibl9GaWVsZCIgbmFtZT0iQm9keSI+DUJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DTwvaW5wMjptX2lmPg08YnIvPjxici8+DQ1Zb3UgY2FuIHZpZXcgeW91ciBhcnRpY2xlIGhlcmUgPGEgaHJlZj0iPGlucDI6bl9BcnRpY2xlTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz48L2E+</EVENT>
-			<EVENT MessageType="html" Event="NEWS.ADD" Type="1">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIEFkZGVkCgpOZXcgQXJ0aWNsZSBoYXMgYmVlbiBzdWJtaXR0ZWQgdG8gb3VyIHdlYnNpdGUhPGJyLz48YnIvPg0NQXJ0aWNsZSBkZXRhaWxzIGFyZSBsaXN0ZWQgYmVsb3c6PGJyLz48YnIvPg0NQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DTxpbnAyOm1faWYgY2hlY2s9Im5fRmllbGQiIG5hbWU9IkJvZHkiPg1Cb2R5OiA8aW5wMjpuX0ZpZWxkIG5hbWU9IkJvZHkiLz48YnIvPg08L2lucDI6bV9pZj4NPGJyLz48YnIvPg0NWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.ADD.PENDING" Type="0">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTmV3IEFydGljbGUgaGFzIGJlZW4gc3VibWl0dGVkIHRvIG91ciB3ZWJzaXRlIGFuZCBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCE8YnIvPjxici8+DQoNCkFydGljbGUgZGV0YWlscyBhcmUgbGlzdGVkIGJlbG93Ojxici8+PGJyLz4NCg0KQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJuX0ZpZWxkIiBuYW1lPSJCb2R5Ij4NCkJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxici8+PGJyLz4NCg0KWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.ADD.PENDING" Type="1">U3ViamVjdDogTmV3IEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTmV3IEFydGljbGUgaGFzIGJlZW4gc3VibWl0dGVkIHRvIG91ciB3ZWJzaXRlIGFuZCBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCE8YnIvPjxici8+DQoNCkFydGljbGUgZGV0YWlscyBhcmUgbGlzdGVkIGJlbG93Ojxici8+PGJyLz4NCg0KQXJ0aWNsZSBUaXRsZTogPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPjxici8+DQo8aW5wMjptX2lmIGNoZWNrPSJuX0ZpZWxkIiBuYW1lPSJCb2R5Ij4NCkJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxici8+PGJyLz4NCg0KWW91IGNhbiB2aWV3IHlvdXIgYXJ0aWNsZSBoZXJlIDxhIGhyZWY9IjxpbnAyOm5fQXJ0aWNsZUxpbmsgdGVtcGxhdGU9Il9fZGVmYXVsdF9fIi8+Ij48aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PC9hPg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.APPROVE" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIEFwcHJvdmVkCgpZb3VyIEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIGFwcHJvdmVk</EVENT>
-			<EVENT MessageType="html" Event="NEWS.DENY" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIERlY2xpbmVkCgpZb3VyIEFydGljbGUgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGhhcyBiZWVuIGRlY2xpbmVkLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY" Type="0">U3ViamVjdDogWW91ciBBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIFVwZGF0ZWQKCllvdXIgQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgaGFzIGJlZW4gdXBkYXRlZC4=</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY" Type="1">U3ViamVjdDogQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBVcGRhdGVkCgpBcnRpY2xlICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBoYXMgYmVlbiB1cGRhdGVkLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY.APPROVE" Type="0">U3ViamVjdDogWW91ciBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIgLz4iIC0gQXBwcm92ZWQhCgpZb3VyIE1vZGlmaWNhdGlvbnMgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIiAvPiIgbGluayB3ZXJlIGFwcHJvdmVkIGJ5IHRoZSB3ZWJzaXRlLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY.DENY" Type="0">U3ViamVjdDogWW91ciBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBEZWNsaW5lZAoKWW91ciBtb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSB3ZXJlIGRlY2xpbmVkLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY.PENDING" Type="0">U3ViamVjdDogTW9kaWZpY2F0aW9ucyBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIC0gUGVuZGluZwoKTW9kaWZpY2F0aW9ucyBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iIGFydGljbGUgYXJlIHBlbmRpbmcgZm9yIGFkbWluaXN0cmF0aXZlIGFwcHJvdmFsLg==</EVENT>
-			<EVENT MessageType="html" Event="NEWS.MODIFY.PENDING" Type="1">U3ViamVjdDogQXJ0aWNsZSBNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQZW5kaW5nCgpNb2RpZmljYXRpb25zIGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSBhcmUgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwu</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSAtIFB1Ymxpc2hlZAoKWW91ciBjb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgYXJ0aWNsZSBoYXMgYmVlbiBwdWJsaXNoZWQu</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD" Type="1">U3ViamVjdDogTmV3IENvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBBcnRpY2xlIFN1Ym1pdHRlZAoKTmV3IGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBhcnRpY2xlIGhhcyBiZWVuIHN1Ym1pdHRlZC4=</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD.PENDING" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQZW5kaW5nCgpUaGFuayB5b3UgZm9yIHN1Ym1pdHRpbmcgeW91ciBjb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIuPGJyLz48YnIvPg0KDQpDdXJyZW50bHkgaXQncyBwZW5kaW5nIGZvciBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbCBhbmQgd2lsbCBiZSBwdWJsaXNoZWQgc2hvcnRseS4=</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.ADD.PENDING" Type="1">WC1NYWlsZXI6IEluLVBvcnRhbApTdWJqZWN0OiBZb3VyIENvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiAtIFBlbmRpbmcgW2FkbWluXQoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgY29tbWVudCBmb3IgIjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz4iLjxici8+PGJyLz4NCg0KQ3VycmVudGx5IGl0J3MgcGVuZGluZyBmb3IgYWRtaW5pc3RyYXRpdmUgYXBwcm92YWwgYW5kIHdpbGwgYmUgcHVibGlzaGVkIHNob3J0bHku</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.APPROVE" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBQdWJsaXNoZWQKClRoYW5rIHlvdSBmb3Igc3VibWl0dGluZyB5b3VyIGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+Ii48YnIvPjxici8+DQoNCkl0J3MgYWxyZWFkeSBwdWJsaXNoZWQgb24gdGhlIHdlYnNpdGUh</EVENT>
-			<EVENT MessageType="html" Event="NEWS.REVIEW.DENY" Type="0">U3ViamVjdDogWW91ciBDb21tZW50IGZvciAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBEZWNsaW5lZAoKU29ycnksIGJ1dCB5b3VyIGNvbW1lbnQgZm9yICI8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+IiBhcnRpY2xlIGhhcyBiZWVuIGRlY2xpbmVkLg==</EVENT>
-		</EVENTS>
-	</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/english.lang
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.5
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/remove_schema.sql
===================================================================
--- releases/5.2.0-B2/install/remove_schema.sql	(revision 15202)
+++ releases/5.2.0-B2/install/remove_schema.sql	(nonexistent)
@@ -1,2 +0,0 @@
-DROP TABLE News;
-DROP TABLE NewsCustomData;
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/remove_schema.sql
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/prerequisites.php
===================================================================
--- releases/5.2.0-B2/install/prerequisites.php	(revision 15202)
+++ releases/5.2.0-B2/install/prerequisites.php	(nonexistent)
@@ -1,81 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @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.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	$prerequisite_class = 'InNewsPrerequisites';
-
-	/**
-	 * Class, that holds all prerequisite scripts for "In-News" module
-	 *
-	 */
-	class InNewsPrerequisites extends kHelper {
-
-		/**
-		 * Install toolkit instance
-		 *
-		 * @var kInstallToolkit
-		 */
-		var $_toolkit = null;
-
-		/**
-		 * Sets common instance of installator toolkit
-		 *
-		 * @param kInstallToolkit $instance
-		 */
-		function setToolkit(&$instance)
-		{
-			$this->_toolkit =& $instance;
-		}
-
-		/**
-		 * Checks minimal version, that could be upgradeable
-		 *
-		 * @param Array $versions
-		 * @param string $mode when called mode {install, upgrade, standalone)
-		 * @return Array
-		 */
-		function CheckPrerequisites($versions, $mode)
-		{
-			$errors = Array ();
-
-			if ($mode == 'standalone') {
-				if (!$this->Application->isModuleEnabled('In-Portal')) {
-					$errors[] = 'Please install or enable "In-Portal" module first';
-				}
-			}
-
-			if ($mode == 'upgrade') {
-				$sql = 'SELECT Version
-						FROM ' . TABLE_PREFIX . 'Modules
-						WHERE Name = "In-Portal"';
-				$inportal_version = $this->Conn->GetOne($sql);
-
-				if ($inportal_version === false) {
-					// only, when In-Portal was installed
-					return $errors;
-				}
-
-				$min_version = '4.3.1';
-
-				$current_version = $this->_toolkit->ConvertModuleVersion($inportal_version);
-				$needed_version = $this->_toolkit->ConvertModuleVersion($min_version);
-				if ($current_version < $needed_version) {
-					$errors[] = 'Please upgrade "In-Portal" to version ' . $min_version;
-				}
-			}
-
-			return $errors;
-		}
-	}
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/prerequisites.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: releases/5.2.0-B2/install/install_order.txt
===================================================================
--- releases/5.2.0-B2/install/install_order.txt	(revision 15202)
+++ releases/5.2.0-B2/install/install_order.txt	(nonexistent)
@@ -1 +0,0 @@
-103
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/install_order.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/img/.htaccess
===================================================================
--- releases/5.2.0-B2/install/img/.htaccess	(revision 15202)
+++ releases/5.2.0-B2/install/img/.htaccess	(nonexistent)
@@ -1 +0,0 @@
-allow from all
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/img/.htaccess
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/img/icon_news_management.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/install/img/icon_news_management.gif
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/install/install_data.sql
===================================================================
--- releases/5.2.0-B2/install/install_data.sql	(revision 15202)
+++ releases/5.2.0-B2/install/install_data.sql	(nonexistent)
@@ -1,184 +0,0 @@
-# Section "in-news:configuration_output":
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_SortField', 'CreatedOn', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'Title=la_Article_Title||Excerpt=la_Article_Excerpt||Author=la_Article_Author||CreatedOn=la_Article_Date||Hits=la_Article_Hits||CachedRating=la_Article_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomFields WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.01, 1, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_SortOrder', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'asc=la_common_ascending||desc=la_common_descending', 10.01, 2, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_SortField2', 'Title', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'Title=la_Article_Title||Excerpt=la_Article_Excerpt||Author=la_Article_Author||CreatedOn=la_Article_Date||Hits=la_Article_Hits||CachedRating=la_Article_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomFields WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.02, 1, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_SortOrder2', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'asc=la_common_ascending||desc=la_common_descending', 10.02, 2, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'Perpage_News', '8', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_perpage_prompt', 'text', '', '', 10.03, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'Perpage_News_Short', '3', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_perpage_short_prompt', 'text', '', '', 10.04, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_CatNewDays', '5', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_newdays_prompt', 'text', '', '', 10.05, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_MinPopRating', '4', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_fld_News_MinPopRating', 'text', '', '', 10.06, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_MinPopVotes', '20', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_fld_News_MinPopVotes', 'text', '', '', 10.07, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_MaxHotNumber', '5', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_fld_News_MaxHotNumber', 'text', '', '', 10.08, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_Archive', '0', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_daysarchive_prompt', 'text', '', '', 10.09, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_ShowPick', '1', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_editorpicksabove_prompt', 'checkbox', '', '', 10.1, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_ReviewDelay_Interval', '3600', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_prompt_DupReviews', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.11, 2, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_ReviewDelay_Value', '12', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.11, 1, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_RatingDelay_Value', '1', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.12, 1, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_RatingDelay_Interval', '86400', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_prompt_DupRating', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.12, 2, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'n_MaxCategories', '3', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_fld_MaxCategories', 'text', NULL, NULL, 10.13, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_SortReviews', 'ReviewText', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'ReviewText=la_opt_CommentText||CreatedOn=la_opt_CreatedOn', 20.01, 1, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_SortReviewsOrder', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 20.01, 2, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_SortReviews2', 'ReviewText', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'ReviewText=la_opt_CommentText||CreatedOn=la_opt_CreatedOn', 20.02, 1, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'News_SortReviewsOrder2', 'asc', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_news_sortreviews2_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 20.02, 2, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'Perpage_NewsReviews_Short', '3', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_review_perpage_short_prompt', 'text', NULL, NULL, 20.03, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'Perpage_NewsReviews', '10', 'In-News', 'in-news:configuration_output', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 20.03, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'n_CategoryTemplate', '/in-news/designs/section', 'In-News', 'in-news:configuration_output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 30.01, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'n_ItemTemplate', 'in-news/articles/article_detail', 'In-News', 'in-news:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 30.02, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'n_MaxImageCount', '5', 'In-News', 'in-news:configuration_output', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 40.01, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'n_ThumbnailImageWidth', '120', 'In-News', 'in-news:configuration_output', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 40.02, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'n_ThumbnailImageHeight', '120', 'In-News', 'in-news:configuration_output', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 40.03, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'n_FullImageWidth', '450', 'In-News', 'in-news:configuration_output', 'la_section_ImageSettings', 'la_config_FullImageWidth', 'text', '', '', 40.04, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'n_FullImageHeight', '450', 'In-News', 'in-news:configuration_output', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 40.05, 0, 0, NULL);
-
-# Section "in-news:configuration_search":
-INSERT INTO SystemSettings VALUES(DEFAULT, 'SearchRel_Keyword_articles', '90', 'In-News', 'in-news:configuration_search', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'SearchRel_Pop_articles', '10', 'In-News', 'in-news:configuration_search', 'la_config_DefaultPop', 'la_text_popularity', 'text', NULL, NULL, 0, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'SearchRel_Rating_articles', '10', 'In-News', 'in-news:configuration_search', 'la_config_DefaultRating', 'la_prompt_Rating', 'text', NULL, NULL, 0, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'SearchRel_Increase_articles', '30', 'In-News', 'in-news:configuration_search', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'Search_ShowMultiple_articles', '0', 'In-News', 'in-news:configuration_search', 'la_config_ShowMultiple', 'la_Text_MultipleShow', 'text', NULL, NULL, 0, 0, 1, NULL);
-
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.ADD', NULL, 1, 1, 'In-News', 'Add Article', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.ADD', NULL, 1, 0, 'In-News', 'Add Article', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.ADD.PENDING', NULL, 1, 1, 'In-News', 'Article Add Pending', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.ADD.PENDING', NULL, 1, 0, 'In-News', 'Article Add Pending', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.MODIFY', NULL, 1, 1, 'In-News', 'Modify Article', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.MODIFY', NULL, 1, 0, 'In-News', 'Modify Article', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.MODIFY.PENDING', NULL, 1, 1, 'In-News', 'Article Modify Pending', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.MODIFY.PENDING', NULL, 1, 0, 'In-News', 'Article Modify Pending', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.MODIFY.APPROVE', NULL, 1, 0, 'In-News', 'Approve Article Modification', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.MODIFY.DENY', NULL, 1, 0, 'In-News', 'Decline Article Modification', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.APPROVE', NULL, 1, 0, 'In-News', 'Approve Article', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.DENY', NULL, 1, 0, 'In-News', 'Decline Article', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.REVIEW.ADD', NULL, 1, 1, 'In-News', 'Article Comment Added', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.REVIEW.ADD', NULL, 1, 0, 'In-News', 'Article Comment Added', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.REVIEW.APPROVE', NULL, 1, 0, 'In-News', 'Article Comment Approved', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.REVIEW.DENY', NULL, 1, 0, 'In-News', 'Article Comment Declined', 0, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, 'In-News', 'Article Comment Pending', 1, 1, 1);
-INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'NEWS.REVIEW.ADD.PENDING', NULL, 1, 0, 'In-News', 'Article Comment Pending', 0, 1, 1);
-
-INSERT INTO ItemTypes VALUES (2, 'In-News', 'n', 'News', 'Title', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_News', 1, 'in-news/admin/addarticle.php', 'clsNews', 'Article');
-
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.ADD', 'la_PermName_News.Add_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.VIEW', 'la_PermName_News.View_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'la_PermName_News.Add.Pending_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'la_PermName_News.Modify_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.DELETE', 'la_PermName_News.Delete_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.RATE', 'la_PermName_News.Rate_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'la_PermName_News.Review_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'la_PermName_News.Review.Pending_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'la_PermName_News.Modify.Pending_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'la_PermName_News.Owner.Modify_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'la_PermName_News.Owner.Modify.Pending_desc', 'In-News', 1);
-INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'la_PermName_News.Owner.Delete_desc', 'In-News', 1);
-
-INSERT INTO SearchConfig VALUES ('News', 'Title', 1, 1, 'lu_fielddesc_news_title', 'lu_field_title', 'In-News', 'la_text_article', 2, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Excerpt', 1, 1, 'lu_fielddesc_news_excerpt', 'lu_field_excerpt', 'In-News', 'la_text_article', 3, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Author', 1, 1, 'lu_fielddesc_news_author', 'lu_field_author', 'In-News', 'la_text_article', 4, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Body', 1, 1, 'lu_fielddesc_news_body', 'lu_field_body', 'In-News', 'la_text_article', 5, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CreatedOn', 0, 1, 'lu_fielddesc_news_createdon', 'lc_field_createdon', 'In-News', 'la_text_article', 6, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'EndOn', 0, 1, 'lu_fielddesc_news_endon', 'lu_field_endon', 'In-News', 'la_text_article', 7, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Hits', 0, 1, 'lu_fielddesc_news_hits', 'lc_field_hits', 'In-News', 'la_text_article', 8, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CachedRating', 0, 1, 'lu_fielddesc_news_cachedrating', 'lc_field_cachedrating', 'In-News', 'la_text_article', 9, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CachedVotesQty', 0, 1, 'lu_fielddesc_news_cachedvotesqty', 'lc_field_cachedvotesqty', 'In-News', 'la_text_article', 10, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CreatedById', 0, 1, 'lu_fielddesc_news_createdbyid', 'lc_field_createdbyid', 'In-News', 'la_text_article', 11, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Priority', 0, 1, 'lu_fielddesc_news_priority', 'lc_field_priority', 'In-News', 'la_text_article', 12, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Status', 0, 1, 'lu_fielddesc_news_status', 'lc_field_status', 'In-News', 'la_text_article', 13, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'EditorsPick', 0, 1, 'lu_fielddesc_news_editorspick', 'lc_field_EditorsPick', 'In-News', 'la_text_article', 14, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'LeadStory', 0, 1, 'lu_fielddesc_news_leadstory', 'lu_field_leadstory', 'In-News', 'la_text_article', 15, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'LeadCatStory', 0, 1, 'lu_fielddesc_news_leadcatstory', 'lu_field_leadcatstory', 'In-News', 'la_text_article', 16, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'ResourceId', 0, 1, 'lu_fielddesc_news_resourceid', 'lc_field_resourceid', 'In-News', 'la_text_article', 17, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'CachedReviewsQty', 0, 1, 'lu_fielddesc_news_cachedreviewsqty', 'lc_field_cachedreviewsqty', 'In-News', 'la_text_article', 18, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'StartDate', 0, 1, 'lu_fielddesc_news_startdate', 'lu_field_startdate', 'In-News', 'la_text_article', 19, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'NewItem', 0, 1, 'lu_fielddesc_news_newitem', 'lc_field_newitem', 'In-News', 'la_text_article', 20, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'PopItem', 0, 1, 'lu_fielddesc_news_popitem', 'lc_field_popitem', 'In-News', 'la_text_article', 21, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'HotItem', 0, 1, 'lu_fielddesc_news_hotitem', 'lc_field_hotitem', 'In-News', 'la_text_article', 22, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Archived', 0, 1, 'lu_fielddesc_news_archived', 'lu_field_archived', 'In-News', 'la_text_article', 23, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'Modified', 0, 1, 'lu_fielddesc_news_modified', 'lc_field_modified', 'In-News', 'la_text_article', 24, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'ModifiedById', 0, 1, 'lu_fielddesc_news_modifiedbyid', 'lc_field_modifiedbyid', 'In-News', 'la_text_article', 25, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'OrgId', 0, 0, 'lu_fielddesc_news_orgid', 'lc_field_orgid', 'In-News', 'la_text_article', 26, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('News', 'NewsId', 0, 1, 'lu_fielddesc_news_newsid', 'lu_field_newsid', 'In-News', 'la_text_article', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO SearchConfig VALUES ('CustomFields', 'RssOriginalURL', 1, 0, 'la_fld_RssOriginalURL', 'lu_fld_RssOriginalURL', 'In-News', 'la_section_CustomFields', 0, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssExpireInterval', 'la_fld_RssExpireInterval', 0, 'la_title_SystemCF', 'la_fld_RssExpireInterval', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssUpdateInterval', 'la_fld_RssUpdateInterval', 0, 'la_title_SystemCF', 'la_fld_RssUpdateInterval', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssLastUpdated', 'la_fld_RssLastUpdated', 0, 'la_title_SystemCF', 'la_fld_RssLastUpdated', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssDeleteExpired', 'la_fld_RssDeleteExpired', 0, 'la_title_SystemCF', 'la_fld_RssDeleteExpired', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 2, 'RssOriginalURL', 'lu_fld_RssOriginalURL', 0, 'la_section_CustomFields', 'la_fld_RssOriginalURL', 'label', 'cut_first="100"', '', 0, 1, 0, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssUpdateIntervalType', 'la_fld_RssUpdateIntervalType', 0, 'la_title_SystemCF', 'la_fld_RssUpdateIntervalType', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssSource', 'la_fld_RssSource', 0, 'la_title_SystemCF', 'la_fld_RssSource', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssExpireIntervalType', 'la_fld_RssExpireIntervalType', 0, 'la_title_SystemCF', 'la_fld_RssExpireIntervalType', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssDefaultExpiration', 'la_fld_RssDefaultExpiration', 0, 'la_title_SystemCF', 'la_fld_RssDefaultExpiration', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssDefaultExpirationType', 'la_fld_RssDefaultExpirationType', 0, 'la_title_SystemCF', 'la_fld_RssDefaultExpirationType', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'RssLastExpired', 'la_fld_RssLastExpired', 0, 'la_title_SystemCF', 'la_fld_RssLastExpired', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 2, 'RssArticleCRC', 'la_fld_RssArticleCRC', 0, 'la_section_SystemCF', 'la_fld_RssArticleCRC', 'text', NULL, '', 0, 0, 1, 0);
-INSERT INTO CustomFields VALUES (DEFAULT, 1, 'n_ItemTemplate', 'la_fld_cust_n_ItemTemplate', 0, 'la_title_SystemCF', 'la_fld_cust_n_ItemTemplate', 'text', NULL, '', 0, 0, 1, 0);
-
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT count(*) FROM <%prefix%>News WHERE Status=1', NULL, 'la_prompt_ActiveArticles', 0, 1);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS TotalArticles FROM <%prefix%>News', NULL, 'la_prompt_ArticlesTotal', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS ActiveArticles FROM <%prefix%>News WHERE Status = 1', NULL, 'la_prompt_ArticlesActive', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS PendingArticles FROM <%prefix%>News WHERE Status = 2', NULL, 'la_prompt_ArticlesPending', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS DisabledArticles FROM <%prefix%>News WHERE Status = 0', NULL, 'la_prompt_DisabledArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS ArchivedArticles FROM <%prefix%>News WHERE Archived = 1', NULL, 'la_prompt_ArticlesArchived', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS NewArticles FROM <%prefix%>News WHERE (NewItem = 1) OR ( (UNIX_TIMESTAMP() - CreatedOn) <= <%m:config name="News_CatNewDays"%>*86400 AND (NewItem = 2) )', NULL, 'la_prompt_NewArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE EditorsPick = 1', NULL, 'la_prompt_EditorsPickArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS HotArticles FROM <%prefix%>News WHERE (HotItem = 1) OR (Hits >= <%m:config name="News_MaxHotNumber"%> AND (HotItem = 2) )', NULL, 'la_prompt_HotArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE LeadStory  = 1', NULL, 'la_prompt_LeadStoryArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>News WHERE LeadCatStory = 1', NULL, 'la_prompt_CategoryLeadStoryArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="AVG(CachedRating)" type="currency" precision="2"%> FROM <%prefix%>News WHERE CachedRating > 0', NULL, 'la_prompt_ArticleAverageRating', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) AS PopularArticles FROM <%prefix%>News WHERE (PopItem = 1) OR ( (CachedRating >= <%article:hit_count type="top"%>) AND <%article:hit_count type="top"%> AND (PopItem = 2) )', NULL, 'la_prompt_PopularArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT MAX(Hits) AS MaxHitsArticles FROM <%prefix%>News', NULL, 'la_prompt_MaxHitsArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT MAX(CachedVotesQty) AS MaxVotesArticles FROM <%prefix%>News', NULL, 'la_prompt_MaxVotesArticles', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="MAX(CreatedOn)" type="date"%> FROM <%prefix%>News', NULL, 'la_prompt_NewestArticleDate', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT <%m:post_format field="MAX(Modified)" type="date"%> FROM <%prefix%>News', NULL, 'la_prompt_LastArticleUpdate', 0, 2);
-INSERT INTO StatItem VALUES (DEFAULT, 'In-News', 'SELECT COUNT(*) FROM <%prefix%>CatalogReviews WHERE Module = \'<%modules:get_current%>\'', NULL, 'la_prompt_ArticleReviews', 0, 2);
-
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 14, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 13, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.DELETE', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 11, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD.PENDING', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 12, 1, 0, {NewsCatId});
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.VIEW', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.DELETE', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.RATE', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.ADD.PENDING', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 15, 0, 0, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:articles.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:setting_folder.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_output.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_output.edit', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_search.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_search.edit', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.view', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.add', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.edit', 11, 1, 1, 0);
-INSERT INTO Permissions VALUES (DEFAULT, 'in-news:configuration_custom.delete', 11, 1, 1, 0);
-
-INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1');
-
-INSERT INTO Modules VALUES ('In-News', 'modules/in-news/', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL, NULL);
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/install_data.sql
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.7
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/install/upgrades.php
===================================================================
--- releases/5.2.0-B2/install/upgrades.php	(revision 15202)
+++ releases/5.2.0-B2/install/upgrades.php	(nonexistent)
@@ -1,111 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @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.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	$upgrade_class = 'InNewsUpgrades';
-
-	/**
-	 * Class, that holds all upgrade scripts for "In-News" module
-	 *
-	 */
-	class InNewsUpgrades extends kUpgradeHelper {
-
-		public function __construct()
-		{
-			parent::__construct();
-
-			$this->dependencies = Array (
-				'4.3.9' => Array ('Core' => '4.3.9'),
-				'5.0.0' => Array ('Core' => '5.0.0'),
-				'5.0.1' => Array ('Core' => '5.0.1'),
-				'5.0.2-B1' => Array ('Core' => '5.0.2-B1'),
-				'5.0.2-B2' => Array ('Core' => '5.0.2-B2'),
-				'5.0.2-RC1' => Array ('Core' => '5.0.2-RC1'),
-				'5.0.2' => Array ('Core' => '5.0.2'),
-				'5.0.3-B1' => Array ('Core' => '5.0.3-B1'),
-				'5.0.3-B2' => Array ('Core' => '5.0.3-B2'),
-				'5.0.3-RC1' => Array ('Core' => '5.0.3-RC1'),
-				'5.0.3' => Array ('Core' => '5.0.3'),
-				'5.0.4-B1' => Array ('Core' => '5.0.4-B1'),
-				'5.0.4-B2' => Array ('Core' => '5.0.4-B2'),
-				'5.0.4' => Array ('Core' => '5.0.4'),
-				'5.1.0-B1' => Array ('Core' => '5.1.0-B1'),
-				'5.1.0-RC1' => Array ('Core' => '5.1.0-RC1'),
-				'5.1.0' => Array ('Core' => '5.1.0'),
-				'5.1.1-B1' => Array ('Core' => '5.1.1-B1'),
-				'5.1.1-RC1' => Array ('Core' => '5.1.1-RC1'),
-				'5.1.1' => Array ('Core' => '5.1.1'),
-				'5.1.2-B1' => Array ('Core' => '5.1.2-B1'),
-				'5.1.2-RC1' => Array ('Core' => '5.1.2-RC1'),
-				'5.1.2' => Array ('Core' => '5.1.2'),
-				'5.1.3-B1' => Array ('Core' => '5.1.3-B2'),
-				'5.1.3-RC1' => Array ('Core' => '5.1.3-RC1'),
-				'5.1.3-RC2' => Array ('Core' => '5.1.3-RC2'),
-				'5.1.3' => Array ('Core' => '5.1.3'),
-			);
-		}
-
-		/**
-		 * Changes table structure, where multilingual fields of TEXT type are present
-		 *
-		 * @param string $mode when called mode {before, after)
-		 */
-		function Upgrade_5_0_0($mode)
-		{
-			if ($mode == 'after') {
-				$root_category = $this->Application->findModule('Name', 'In-News', 'RootCat');
-
-				$sql = 'UPDATE ' . $this->Application->getUnitOption('c', 'TableName') . '
-						SET UseMenuIconUrl = 1, MenuIconUrl = "in-news/img/menu_articles.gif"
-						WHERE ' . $this->Application->getUnitOption('c', 'IDField') . ' = ' . $root_category;
-				$this->Conn->Query($sql);
-
-				$this->_updateDetailTemplate('n', 'innews/detail', 'in-news/designs/detail');
-			}
-		}
-
-		/**
-		 * Update to 5.0.1
-		 *
-		 * @param string $mode when called mode {before, after)
-		 */
-		function Upgrade_5_0_1($mode)
-		{
-			if ($mode == 'after') {
-				$this->_updateDetailTemplate('n', 'in-news/designs/detail', 'in-news/articles/article_detail');
-
-				// delete old events
-				$events_to_delete = Array ( 'NEWS.OWNER.MODIFY.PENDING', 'NEWS.OWNER.MODIFY' );
-
-				$sql = 'SELECT EventId FROM ' . TABLE_PREFIX . 'Events
-							WHERE Event IN ("' . implode('","', $events_to_delete) . '")';
-				$event_ids = $this->Conn->GetCol($sql);
-
-				if ($event_ids) {
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
-								WHERE EventId IN (' . implode(',', $event_ids) . ')';
-					$this->Conn->Query($sql);
-
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Events
-								WHERE EventId IN (' . implode(',', $event_ids) . ')';
-					$this->Conn->Query($sql);
-
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
-								WHERE Phrase IN ("la_event_news.owner.modify", "la_event_news.owner.modify.pending")';
-					$this->Conn->Query($sql);
-				}
-			}
-		}
-	}
\ No newline at end of file

Property changes on: releases/5.2.0-B2/install/upgrades.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: releases/5.2.0-B2/units/.htaccess
===================================================================
--- releases/5.2.0-B2/units/.htaccess	(revision 15202)
+++ releases/5.2.0-B2/units/.htaccess	(nonexistent)
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file

Property changes on: releases/5.2.0-B2/units/.htaccess
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/units/articles/articles_tag_processor.php
===================================================================
--- releases/5.2.0-B2/units/articles/articles_tag_processor.php	(revision 15202)
+++ releases/5.2.0-B2/units/articles/articles_tag_processor.php	(nonexistent)
@@ -1,33 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @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.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class ArticlesTagProcessor extends kCatDBTagProcessor {
-
-		function ListRelatedArticles($params)
-		{
-			return $this->PrintList2($params);
-		}
-
-		function ListArticles($params)
-		{
-			return $this->PrintList2($params);
-		}
-
-		function ArticleLink($params)
-		{
-			return $this->ItemLink($params, 'article');
-		}
-	}
\ No newline at end of file

Property changes on: releases/5.2.0-B2/units/articles/articles_tag_processor.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: releases/5.2.0-B2/units/articles/articles_config.php
===================================================================
--- releases/5.2.0-B2/units/articles/articles_config.php	(revision 15202)
+++ releases/5.2.0-B2/units/articles/articles_config.php	(nonexistent)
@@ -1,574 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @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.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	$config =	Array (
-					'Prefix'			=>	'n',
-
-					'ItemClass'			=>	Array ('class' => 'kCatDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
-					'ListClass'			=>	Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array ('class' => 'ArticlesEventHandler', 'file' => 'articles_event_handler.php', 'build_event' => 'OnBuild'),
-					'TagProcessorClass' =>	Array ('class' => 'ArticlesTagProcessor', 'file' => 'articles_tag_processor.php', 'build_event' => 'OnBuild'),
-					'AutoLoad'			=>	true,
-
-					'ConfigPriority' => 0,
-
-					'RewritePriority' => 102,
-					'RewriteListener' => 'CategoryItemRewrite:RewriteListener',
-
-					'Hooks' => Array (
-						Array (
-							'Mode' => hAFTER,
-							'Conditional' => false,
-							'HookToPrefix' => 'c',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array ('OnAfterConfigRead'),
-							'DoPrefix' => '',
-							'DoSpecial' => '',
-							'DoEvent' => 'OnUpdateCategoryCustomFields',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => '',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array ('OnAfterConfigRead'),
-							'DoPrefix' => 'cdata',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnDefineCustomFields',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => '#file',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array ('OnAfterConfigRead'),
-							'DoPrefix' => '',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnCloneSubItem',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => 'rev',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array ('OnAfterConfigRead'),
-							'DoPrefix' => '',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnCloneSubItem',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => 'fav',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array ('OnAfterConfigRead'),
-							'DoPrefix' => '',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnCloneSubItem',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => 'rel',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array ('OnAfterConfigRead'),
-							'DoPrefix' => '',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnCloneSubItem',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => 'img',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array ('OnAfterConfigRead'),
-							'DoPrefix' => '',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnCloneSubItem',
-						),
-
-						Array (
-							'Mode' => hBEFORE,
-							'Conditional' => false,
-							'HookToPrefix' => 'ci',
-							'HookToSpecial' => '*',
-							'HookToEvent' => Array ('OnAfterConfigRead'),
-							'DoPrefix' => '',
-							'DoSpecial' => '*',
-							'DoEvent' => 'OnCloneSubItem',
-						),
-					),
-
-					'CatalogItem' 			=>	true,
-					'AdminTemplatePath'		=>	'articles',
-					'AdminTemplatePrefix'	=>	'articles_',
-					'SearchConfigPostfix' 	=>	'articles',
-
-					'QueryString'		=>	Array (
-												1	=>	'id',
-												2	=>	'Page',
-												3	=>	'PerPage',
-												4	=>	'event',
-												5	=>	'mode',
-											),
-
-					'ScheduledTasks' => Array(
-						'update_rss_articles' => Array('EventName' => 'OnUpdateRSSArticles', 'RunInterval' => 60),
-					),
-					'IDField'			=>	'NewsId',
- 					'StatusField'		=>	Array ('Status'),	// field, that is affected by Approve/Decline events
-
-					'TitleField'		=>	'Title',		// field, used in bluebar when editing existing item
-					'TitlePhrase'		=>	'la_Text_Article',	// phrase used to specify item type in relationship list
-
-					'TitlePresets'		=>	Array (
-	   												'default'	=>	Array (	'new_status_labels'		=> Array ('n' => '!la_title_AddingArticle!'),
-																			'edit_status_labels'	=> Array ('n' => '!la_title_EditingArticle!'),
-																			'new_titlefield'		=> Array ('n' => '!la_title_NewArticle!'),
-																	),
-
-													'articles_edit' => Array ('prefixes' => Array ('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_General!"),
-
-													'articles_categories' =>Array ('prefixes' => Array ('n', 'n-ci_List'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Categories!"),
-													'articles_relations' =>	Array ('prefixes' => Array ('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Relations!"),
-													'articles_images'	=>	Array ('prefixes' => Array ('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Images!"),
-													'articles_files'	=>	Array ('prefixes' => Array ('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Files!"),
-													'articles_reviews'	=>	Array ('prefixes' => Array ('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Reviews!"),
-													'articles_custom'	=>	Array ('prefixes' => Array ('n'), 'format' => "#n_status# '#n_titlefield#' - !la_title_Custom!"),
-
-													'images_edit'		=>	Array (	'prefixes'				=>	Array ('n', 'n-img'),
-																					'new_status_labels'		=>	Array ('n-img' => '!la_title_Adding_Image!'),
-																					'edit_status_labels'	=>	Array ('n-img' => '!la_title_Editing_Image!'),
-																					'new_titlefield'		=>	Array ('n-img' => '!la_title_New_Image!'),
-																					'format'				=>	"#n_status# '#n_titlefield#' - #n-img_status# '#n-img_titlefield#'",
-																			),
-													'file_edit' => Array (
-														'prefixes' => Array ('n', 'n-file'),
-														'new_status_labels' => Array ('n-file' => "!la_title_AddingFile!"),
-														'edit_status_labels' => Array ('n-file' => '!la_title_EditingFile!'),
-														'new_titlefield' => Array ('n-file' => '!la_title_NewFile!'),
-														'format' => "#n_status# '#n_titlefield#' - #n-file_status# '#n-file_titlefield#'",
-														),
-
-													'reviews_edit'	=>	Array (		'prefixes'				=>	Array ('n', 'n-rev'),
-																					'new_status_labels'		=>	Array ('n-rev' =>"!la_title_Adding_Review! '!la_title_New_Review!'"),
-																					'edit_status_labels'	=>	Array ('n-rev' => '!la_title_Editing_Review!'),
-																					'format'				=>	"#n_status# '#n_titlefield#' - #n-rev_status#",
-																			),
-
-													'relations_edit'	=>	Array (	'prefixes'				=>	Array ('n', 'n-rel'),
-																					'new_status_labels'		=>	Array ('n-rel' =>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"),
-																					'edit_status_labels'	=>	Array ('n-rel' => '!la_title_Editing_Relationship!'),
-																					'format'				=>	"#n_status# '#n_titlefield#' - #n-rel_status#",
-																			),
-
-	   												'tree_in-news'	=>	Array ('format' => '!la_Text_Version! '.$this->Application->findModule('Name', 'In-News', 'Version')),
-
-													'articles_export' => Array ('format' => '!la_title_ArticlesExport!'),
-
-													'articles_import' => Array ('format' => '!la_title_ImportArticles!'),
-   											),
-
-   					'EditTabPresets' => Array (
-   						'Default' => Array (
-   							Array ('title' => 'la_tab_General', 't' => 'in-news/articles/articles_edit', 'priority' => 1),
-   							Array ('title' => 'la_tab_Categories', 't' => 'in-news/articles/articles_categories', 'priority' => 2),
-   							Array ('title' => 'la_tab_Relations', 't' => 'in-news/articles/articles_relations', 'priority' => 3),
-   							Array ('title' => 'la_tab_Images', 't' => 'in-news/articles/articles_images', 'priority' => 4),
-   							Array ('title' => 'la_tab_Files', 't' => 'in-news/articles/articles_files', 'priority' => 5),
-   							Array ('title' => 'la_tab_Reviews', 't' => 'in-news/articles/articles_reviews', 'priority' => 6),
-   							Array ('title' => 'la_tab_Custom', 't' => 'in-news/articles/articles_custom', 'priority' => 7),
-   						),
-   					),
-
-   					'PermItemPrefix'	=>	'NEWS',
-
-   					'PermTabText'		=>	'In-News',
-   					'PermSection'		=>	Array ('main' => 'CATEGORY:in-news:articles_list', 'search' => 'in-news:configuration_search', 'custom' => 'in-news:configuration_custom'),
-
-					'Sections'			=>	Array (
-						/*'in-news'	=>	Array (
-							'parent'		=>	'in-portal:root',
-							'icon'			=>	'settings_in-newz',
-							'label'			=>	'la_title_In-News',
-							'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array ('view'),
-							'priority'		=>	3.2,
-							'container'		=>	true,
-							'type'			=>	stTREE,
-						),*/
-
-						'in-news:articles'	=>	Array (
-							'parent'		=>	'in-portal:site',
-							'icon'			=>	'articles',
-							'label'			=>	'la_tab_Articles',
-							'url'			=>	Array ('t' => 'catalog/advanced_view', 'anchor' => 'tab-n.showall', 'pass' => 'm'),
-							'onclick'		=>	'setCatalogTab(\'n.showall\')',
-							'permissions'	=>	Array ('view'),
-							'priority'		=>	3.3,
-							'type'			=>	stTREE,
-						),
-
-						// article settings
-						'in-news:setting_folder' => Array (
-							'parent'		=>	'in-portal:system',
-							'icon'			=>	'conf_news',
-							'label'			=>	'la_title_In-News',
-							'use_parent_header' => 1,
-							'url'			=>	Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array ('view'),
-							'priority'		=>	3.4,
-							'container'		=>	true,
-							'type'			=>	stTREE,
-						),
-
-						/*'in-news:innews_general'	=>	Array (
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:settings_general',
-							'label'			=>	'la_tab_GeneralSettings',
-							'url'			=>	Array ('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array ('view', 'edit'),
-							'priority'		=>	0.9,
-							'type'			=>	stTREE,
-						),*/
-
-						'in-news:configuration_output'	=>	Array (
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:conf_output',
-							'label'			=>	'la_tab_ConfigOutput',
-							'url'			=>	Array ('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array ('view', 'edit'),
-							'priority'		=>	1,
-							'type'			=>	stTREE,
-						),
-
-						'in-news:configuration_search'	=>	Array (
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:conf_search',
-							'label'			=>	'la_tab_ConfigSearch',
-							'url'			=>	Array ('t' => 'config/config_search', 'module_key' => 'articles', 'pass_section' => true, 'pass' => 'm'),
-							'permissions'	=>	Array ('view', 'edit'),
-							'priority'		=>	2,
-							'type'			=>	stTREE,
-						),
-
-						'in-news:configuration_custom'	=>	Array (
-							'parent'		=>	'in-news:setting_folder',
-							'icon'			=>	'core:conf_customfields',
-							'label'			=>	'la_tab_ConfigCustom',
-							'url'			=>	Array ('t' => 'custom_fields/custom_fields_list', 'cf_type' => 2, 'pass_section' => true, 'pass' => 'm,cf'),
-							'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
-							'priority'		=>	3,
-							'type'			=>	stTREE,
-						),
-
-					),
-
-					'FilterMenu'		=>	Array (
-						'Groups' => Array (
-							Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => kDBList::HAVING_FILTER),
-							Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => kDBList::HAVING_FILTER),
-							Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => kDBList::HAVING_FILTER),
-							Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => kDBList::WHERE_FILTER),
-						),
-						'Filters' => Array (
-							'show_new'	=>	Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
-							'show_hot'	=>	Array ('label' => 'la_Text_Hot', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
-							'show_pop'	=>	Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
-							'show_pick'	=>	Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
-						),
-					),
-
-					'CatalogSelectorName'	=>	'newslist',
-
-					'ItemPropertyMappings'	=>	Array (
-														'NewDays'		=>	'News_CatNewDays',	// number of days item to be NEW
-														'MinPopVotes'	=>	'News_MinPopVotes',	// minimum number of votes for an item to be POP
-														'MinPopRating'	=>	'News_MinPopRating',// minimum rating for an item to be POP
-														'MaxHotNumber'	=>	'News_MaxHotNumber',// maximum number of HOT items
-
-														'HotLimit'		=>	'News_HotLimit',	// variable name in inp_Cache table
-														'ClickField'	=>	'Hits',				// item click count is stored here (in item table)
-												),
-
-					'ItemType'			=>	2,	// this is used when relation to product is added from in-portal and via-versa
-
-					'ViewMenuPhrase'	=>	'la_title_Articles',
-					'CatalogTabIcon' => 'in-news:icon16_articles.png',
-					'UsePendingEditing'	=>	true, // item editing is controlled by NEWS.ADD/EDIT, NEWS.ADD/EDIT.PENDING permissions
-
-					'StatisticsInfo'	=>	Array (
-													'pending'	=>	Array (
-																			'icon'		=>	'icon16_article_pending.gif',
-																			'label'		=>	'la_Text_Articles',
-																			'js_url' 	=>	'#url#',
-																			'url'		=>	Array ('t' => 'catalog/advanced_view', 'SetTab' => 'n', 'pass' => 'm,n.showall', 'n.showall_event' => 'OnSetFilterPattern', 'n.showall_filters' => 'show_active=0,show_pending=1,show_disabled=0,show_new=1,show_hot=1,show_pop=1,show_pick=1'),
-																			'status'	=>	STATUS_PENDING,
-																	),
-											),
-
-					'TableName'			=>	TABLE_PREFIX.'News',
-					'CustomDataTableName' => TABLE_PREFIX . 'NewsCustomData',
-
-					'CalculatedFields' => Array (
-						'' => Array (
-							'UserName'		=>	'IF (ISNULL(u.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
-							'CategoryId'	=>	TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
-							'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
-							'CategoryFilename' => TABLE_PREFIX.'Categories.NamedParentPath',
-							'PrimaryCat'	=> TABLE_PREFIX.'%3$sCategoryItems.PrimaryCat',
-							'ParentPath' => TABLE_PREFIX.'Categories.ParentPath',
-
-							'AltName'		=>	'img.AltName',
-							'SameImages'	=>	'img.SameImages',
-							'LocalThumb'	=>	'img.LocalThumb',
-							'ThumbPath'		=>	'img.ThumbPath',
-							'ThumbUrl'		=>	'img.ThumbUrl',
-							'LocalImage'	=>	'img.LocalImage',
-							'LocalPath'		=>	'img.LocalPath',
-							'FullUrl'		=>	'img.Url',
-						),
-					),
-
-					'CacheModRewrite' => true,
-
-					'ListSQLs'			=>	Array (	'' => '	SELECT %1$s.* %2$s
-															FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
-															LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-															LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.CreatedById = u.PortalUserId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
-											), // key - special, value - list select sql
-
-					'ListSortings'	=> 	Array (
-												'' => Array (
-															'ForcedSorting' => Array ('EditorsPick' => 'desc', 'Priority' => 'desc'),
-															'Sorting' => Array ('Title' => 'asc'),
-														)
-										),
-					'ItemSQLs'			=>	Array (	'' => '	SELECT %1$s.* %2$s
-															FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
-															LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-															LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.CreatedById = u.PortalUserId
-															LEFT JOIN '.TABLE_PREFIX.'%3$sNewsCustomData cust ON %1$s.ResourceId = cust.ResourceId'),
-
-					'SubItems' => Array ('n-rev', 'n-ci', 'n-rel', 'n-img', 'n-cdata', 'n-fav', 'n-file'),
-
-					'Fields' => Array (
-			            'NewsId'			=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
-			            'Title'				=>	Array ('type' => 'string', /*'formatter' => 'kMultiLanguage', */'not_null' => 1, 'required' => 1, 'default' => '', 'max_len' => 255),
-			            'AutomaticFilename' =>	Array (
-					    	'type' => 'int',
-					    	'formatter' => 'kOptionsFormatter',
-					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
-					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
-						),
-			            'Excerpt'			=>	Array ('type' => 'string', /*'formatter' => 'kMultiLanguage',*/ 'default' => null),
-			            'Author'			=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
-			            'Body'				=>	Array ('type' => 'string', 'formatter' => 'kFormatter',/*'kMultiLanguage'*/ 'using_fck' => 1, 'required' => 1, 'default' => null),
-			            'CreatedOn'			=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
-			            'TextFormat'		=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			            'EndOn'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
-			            'Hits'				=>	Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
-			            'CachedRating'		=>	Array ('type' => 'string', 'default' => 0),
-			            'CachedVotesQty'	=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			            'CreatedById' => Array (
-			            	'type' => 'int',
-			            	'formatter' => 'kLEFTFormatter',
-			            	'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
-			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users
-			            					WHERE `%s` = \'%s\'',
-			            	'left_key_field' => 'PortalUserId',
-			            	'left_title_field' => 'Username',
-							'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
-			            	'sample_value' => 'Guest', 'required' => 1, 'default' => NULL,
-						),
-			            'Priority'			=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			            'Status'			=>	Array (
-			            	'type' => 'int',
-			            	'formatter' => 'kOptionsFormatter',
-			            	'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1,
-			            	'not_null' => 1, 'default' => 2,
-						),
-			            'EditorsPick'		=>	Array (
-			            	'type' => 'int',
-			            	'formatter' => 'kOptionsFormatter',
-			            	'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-			            	'not_null' => 1, 'default' => 0,
-						),
-			            'LeadStory'			=>	Array (
-			            	'type' => 'int',
-			            	'formatter' => 'kOptionsFormatter',
-			            	'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-			            	'not_null' => 1, 'default' => 0,
-						),
-			            'LeadCatStory'		=>	Array (
-			            	'type' => 'int',
-			            	'formatter' => 'kOptionsFormatter',
-			            	'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
-			            	'not_null' => 1, 'default' => 0,
-						),
-			            'ResourceId'		=>	Array ('type' => 'int', 'default' => null),
-			            'CachedReviewsQty'	=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-			            'StartDate'			=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
-			            'NewItem'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
-						'PopItem'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
-			            'HotItem'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never'), 'use_phrases' => 1,  'not_null' => 1, 'default' => 2),
-			            'Archived'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 2 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
-			            'Modified'			=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
-			            'ModifiedById'		=>	Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL),
-			            'OrgId'				=>	Array ('type' => 'int', 'default' => null),
-			            'MetaKeywords'			=>	Array ('type' => 'string', 'default' => null),
-						'MetaDescription'		=>	Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
-					),
-
-					'VirtualFields'	=> 	Array (
-						'MoreCategories'		=>	Array ('type' => 'string', 'default' => ''),
-
-						'UserName'				=>	Array ('type' => 'string', 'default' => ''),
-						'CategoryId'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
-
-						'cust_RssOriginalURL'	=>	Array ('type' => 'string', 'default' => ''),
-						'cust_RssArticleCRC'	=>	Array ('type' => 'int', 'default' => 0),
-						'Filename'				=>	Array ('type' => 'string', 'default' => ''),
-						'CategoryFilename'		=>	Array ('type' => 'string', 'default' => ''),
-						'PrimaryCat'			=>	Array ('type' => 'int', 'default' => 0),
-						'IsHot'					=>	Array ('type' => 'int', 'default' => 0),
-						'IsNew'					=>	Array ('type' => 'int', 'default' => 0),
-						'IsPop'					=>	Array ('type' => 'int', 'default' => 0),
-						'CachedNavbar'			=>	Array ('type' => 'string', 'default' => ''),
-						'ParentPath'			=>	Array ('type' => 'string', 'default' => ''),
-
-						// for primary image
-						'AltName'		=>	Array ('type' => 'string', 'default' => ''),
-						'SameImages'	=>	Array ('type' => 'string', 'default' => ''),
-						'LocalThumb'	=>	Array ('type' => 'string', 'default' => ''),
-						'ThumbPath'		=>	Array ('type' => 'string', 'default' => ''),
-						'ThumbUrl'		=>	Array ('type' => 'string', 'default' => ''),
-						'LocalImage'	=>	Array ('type' => 'string', 'default' => ''),
-						'LocalPath'		=>	Array ('type' => 'string', 'default' => ''),
-						'FullUrl'		=>	Array ('type' => 'string', 'default' => ''),
-
-						// export related fields: begin
-						'CategoryId'	=>	Array ('type' => 'int', 'default' => 0),
-						'ExportFormat'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),
-						'ExportFilename'		=>	Array ('type' => 'string', 'default' => ''),
-						'FieldsSeparatedBy'		=>	Array ('type' => 'string', 'default' => ','),
-						'FieldsEnclosedBy'		=>	Array ('type' => 'string', 'default' => '"'),
-						'LineEndings'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Windows', 2 => 'UNIX'), 'default' => 1),
-						'LineEndingsInside'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CRLF', 2 => 'LF'), 'default' => 2),
-						'IncludeFieldTitles'	=>	Array (
-					    	'type' => 'int',
-					    	'formatter' => 'kOptionsFormatter',
-					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
-					    	'use_phrases' => 1, 'default' => 1,
-						),
-						'ExportColumns'			=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
-						'AvailableColumns'		=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
-						'CategoryFormat'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1),
-						'CategorySeparator'		=>	Array ('type' => 'string', 'default' => ':'),
-						'IsBaseCategory'		=>	Array (
-					    	'type' => 'int',
-					    	'formatter' => 'kOptionsFormatter',
-					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
-					    	'use_phrases' => 1, 'default' => 0,
-						),
-						// export related fields: end
-
-						// import related fields: begin
-						'FieldTitles'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1),
-						'ImportSource'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2),
-						'ImportFilename'		=>	Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/', 'default' => ''),
-						'ImportLocalFilename'	=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''),
-						'CheckDuplicatesMethod'	=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1),
-						'ReplaceDuplicates'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0),
-						'DuplicateCheckFields'	=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ('Title' => 'TITLE'), 'default' => '|Title|'),
-						'SkipFirstRow'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 1),
-						// import related fields: end
-					),
-
-					'Grids'	=> Array (
-						'Default' => Array (
-							'Icons' => Array (
-								0 => 'icon16_article_disabled.png',
-								1 => 'icon16_article.png',
-								2 => 'icon16_article_pending.png',
-								'NEW' => 'icon16_article_new.png',
-							),
-
-							'Fields' => Array (
-								'NewsId' =>	Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Title' => Array ('data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
-								'UserName' => Array ('title' => 'column:la_fld_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'LeadStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
-								'LeadCatStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
-								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'EndOn' => Array ('data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-							),
-						),
-
-
-						'Radio'	=>	Array (
-							'Icons' => Array (
-								0 => 'icon16_article_disabled.png',
-								1 => 'icon16_article.png',
-								2 => 'icon16_article_pending.png',
-								-2 => 'icon16_article_pending.png', // pending DUPLICATE item
-								'NEW' => 'icon16_article_new.gif',
-							),
-
-							'Selector' => 'radio',
-							'Fields' => Array (
-								'NewsId' =>	Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Title' => Array ('data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
-								'UserName' => Array ('title' => 'column:la_fld_Author', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'LeadStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ),
-								'LeadCatStory' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ),
-								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'StartDate' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'EndOn' => Array ('data_block' => 'article_expire_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-							),
-						),
-					),
-
-					'ConfigMapping' => 	Array (
-												'PerPage'				=>	'Perpage_News',
-												'ShortListPerPage'		=>	'Perpage_News_Short',
-												'ForceEditorPick'		=>	'News_ShowPick',
-												'DefaultSorting1Field'	=>	'News_SortField',
-												'DefaultSorting2Field'	=>	'News_SortField2',
-												'DefaultSorting1Dir'	=>	'News_SortOrder',
-												'DefaultSorting2Dir'	=>	'News_SortOrder2',
-
-												'RatingDelayValue'		=>	'News_RatingDelay_Value',
-												'RatingDelayInterval'	=>	'News_RatingDelay_Interval',
-										),
-			);
\ No newline at end of file

Property changes on: releases/5.2.0-B2/units/articles/articles_config.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.52.2.18
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: releases/5.2.0-B2/units/articles/articles_event_handler.php
===================================================================
--- releases/5.2.0-B2/units/articles/articles_event_handler.php	(revision 15202)
+++ releases/5.2.0-B2/units/articles/articles_event_handler.php	(nonexistent)
@@ -1,575 +0,0 @@
-<?php
-/**
-* @version	$Id$
-* @package	In-News
-* @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.org/license for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class ArticlesEventHandler extends kCatDBEventHandler {
-
-		/**
-		 * Filters out archived articles
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 * @see kDBEventHandler::OnListBuild()
-		 */
-		protected function SetCustomQuery(kEvent $event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object = $event->getObject();
-			/* @var $object kDBList */
-
-			if ( !$this->Application->isAdminUser ) {
-				$where_clause = '(Archived = 0) AND (StartDate < ' . adodb_mktime() . ' OR StartDate = 0) AND (EndOn > ' . adodb_mktime() . ' OR EndOn IS NULL)';
-				$object->addFilter('archived_filter', $where_clause);
-			}
-		}
-
-		/**
-		 * Return type clauses for list bulding on front
-		 *
-		 * @param kEvent $event
-		 * @return Array
-		 */
-		function getTypeClauses($event)
-		{
-			$type_clauses = parent::getTypeClauses($event);
-
-			$type_clauses['site_lead']['include']='%1$s.LeadStory = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
-			$type_clauses['site_lead']['except']='%1$s.LeadStory <> 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
-			$type_clauses['site_lead']['having_filter'] = false;
-
-			$type_clauses['cat_lead']['include']='%1$s.LeadCatStory = 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
-			$type_clauses['cat_lead']['except']='%1$s.LeadCatStory <> 1 AND '.TABLE_PREFIX.'CategoryItems.PrimaryCat = 1';
-			$type_clauses['cat_lead']['having_filter'] = false;
-
-			return $type_clauses;
-		}
-
-
-		/**
-		 * [CRON] Deletes expired articles + update existing articles from rss feed with new data (key - article url)
-		 *
-		 * @param kEvent $event
-		 */
-		function OnUpdateRSSArticles($event)
-		{
-			if ( defined('IS_INSTALL') && IS_INSTALL ) {
-				return;
-			}
-
-			$category_table = $this->Application->getUnitOption('c', 'TableName');
-			$custom_table = $this->Application->getUnitOption('c-cdata', 'TableName');
-
-			$category_custom_fields = $this->getCustomColumns('c');
-			$article_custom_fields = $this->getCustomColumns($event->Prefix);
-
-
-			// update categories which sould be updated
-			$sql = 'SELECT cd.*, c.CategoryId
-					FROM '.$category_table.' c
-					LEFT JOIN '.$custom_table.' cd ON c.ResourceId = cd.ResourceId
-					WHERE 	(IF(cd.'.$category_custom_fields['RssLastUpdated'].' IS NULL, 0, cd.'.$category_custom_fields['RssLastUpdated'].') +
-							cd.'.$category_custom_fields['RssUpdateInterval'].' * cd.'.$category_custom_fields['RssUpdateIntervalType'].' <=
-							'.adodb_mktime().') AND (LENGTH('.$category_custom_fields['RssSource'].') > 0)';
-			$categories = $this->Conn->Query($sql, 'CategoryId');
-			if ($categories) {
-				$resource_ids = Array();
-				foreach ($categories as $category_id => $category_data) {
-					$resource_ids[] = $category_data['ResourceId'];
-					$event->setEventParam('source_url', $category_data[ $category_custom_fields['RssSource'] ]);
-					$event->setEventParam('category_id', $category_id);
-					$event->setEventParam('custom_fields', $article_custom_fields);
-					$event->setEventParam('life_time',  $category_data[ $category_custom_fields['RssDefaultExpiration'] ] * $category_data[ $category_custom_fields['RssDefaultExpirationType'] ]);
-					$this->parseFeed($event);
-				}
-
-				$sql = 'UPDATE '.$custom_table.'
-						SET '.$category_custom_fields['RssLastUpdated'].' = '.adodb_mktime().'
-						WHERE ResourceId IN ('.implode(',', $resource_ids).')';
-				$this->Conn->Query($sql);
-			}
-
-			// delete expired articles from feed categories
-			$sql = 'SELECT c.CategoryId, c.ResourceId
-					FROM '.$category_table.' c
-					LEFT JOIN '.$custom_table.' cd ON c.ResourceId = cd.ResourceId
-					WHERE (	IF(cd.'.$category_custom_fields['RssLastExpired'].' IS NULL, 0, cd.'.$category_custom_fields['RssLastExpired'].') +
-							cd.'.$category_custom_fields['RssExpireInterval'].' * cd.'.$category_custom_fields['RssExpireIntervalType'].' <=
-							'.adodb_mktime().') AND (cd.'.$category_custom_fields['RssDeleteExpired'].' = 1)';
-
-			$categories = $this->Conn->GetCol($sql, 'ResourceId');
-
-			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
-			$ci_table = $this->Application->getUnitOption($event->Prefix.'-ci', 'TableName');
-
-			if ($categories) {
-				$article_custom_table = $this->Application->getUnitOption($event->Prefix.'-cdata', 'TableName');
-
-				$sql = 'SELECT main_table.'.$id_field.'
-						FROM '.$table.' main_table
-						LEFT JOIN '.$ci_table.' ci ON main_table.ResourceId = ci.ItemResourceId
-						LEFT JOIN '.$article_custom_table.' cd ON main_table.ResourceId = cd.ResourceId
-						WHERE 	(ci.PrimaryCat = 1) AND
-								(ci.CategoryId IN ('.implode(',', $categories).')) AND
-								(main_table.EndOn < '.adodb_mktime().' AND main_table.EndOn IS NOT NULL) AND
-								(LENGTH(cd.'.$article_custom_fields['RssOriginalURL'].') > 0)';
-				$article_ids = $this->Conn->GetCol($sql);
-				if ($article_ids) {
-					$temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
-					/* @var $temp_handler kTempTablesHandler */
-
-					$temp_handler->DeleteItems($event->Prefix, $event->Special, $article_ids);
-				}
-
-				$sql = 'UPDATE '.$custom_table.'
-						SET '.$category_custom_fields['RssLastExpired'].' = '.adodb_mktime().'
-						WHERE ResourceId IN ('.implode(',', array_keys($categories)).')';
-				$this->Conn->Query($sql);
-			}
-		}
-
-		/**
-		 * Returns article ids & crc, that are created during feed import
-		 *
-		 * @param kEvent $event
-		 * @return Array
-		 */
-		function getFeedArticles($event)
-		{
-			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
-			$custom_table = $this->Application->getUnitOption($event->Prefix.'-cdata', 'TableName');
-
-			$crc_field = $event->getEventParam('custom_fields', 'RssArticleCRC');
-
-			$sql = 'SELECT main_table.'.$id_field.', cd.'.$crc_field.'
-					FROM '.$table.' main_table
-					LEFT JOIN '.$custom_table.' cd ON cd.ResourceId = main_table.ResourceId
-					WHERE LENGTH(cd.'.$crc_field.') > 0';
-			return $this->Conn->GetCol($sql, $crc_field);
-		}
-
-		/**
-		 * Creates new, updates existing articles from feed url specified
-		 *
-		 * @param kEvent $event
-		 */
-		function parseFeed($event)
-		{
-			$source_urls = explode(',', $event->getEventParam('source_url'));
-			if (count($source_urls) > 1) {
-				foreach ($source_urls as $source_url) {
-					$event->setEventParam('source_url', $source_url);
-					$this->parseFeed($event);
-				}
-				return true;
-			}
-
-			$curl_helper = $this->Application->recallObject('CurlHelper');
-			/* @var $curl_helper kCurlHelper */
-
-			$curl_helper->followLocation = true;
-			$curl_helper->setOptions( Array (CURLOPT_USERAGENT => 'Mozilla/5.0 (Windows; U; Windows NT 5.2; ru; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3 (.NET CLR 3.5.30729)') ); // otherwise FeedBurner will return HTML
-
-			$xml_data = $curl_helper->Send($event->getEventParam('source_url'));
-
-			if (!$xml_data) {
-				return false;
-			}
-
-			$xml_helper = $this->Application->recallObject('kXMLHelper');
-			/* @var $xml_helper kXMLHelper */
-
-			$root_node =& $xml_helper->Parse($xml_data, kXMLHelper::XML_WITH_TEXT_NODES);
-
-			$feed_types = Array (
-				'rss_2.0' => 'channel', 'atom' => 'feed',
-			);
-
-			foreach ($feed_types as $feed_type => $node_name) {
-				$article_node =& $root_node->FindChild($node_name);
-				if (is_object($article_node)) {
-					break;
-				}
-			}
-
-			if (!$article_node) {
-				return false;
-			}
-
-			$category_id = $event->getEventParam('category_id');
-			$backup_category_id = $this->Application->GetVar('m_cat_id');
-			$this->Application->SetVar('m_cat_id', $category_id);
-
-			switch ($feed_type) {
-				case 'rss_2.0':
-					$this->parseRssFeed($article_node, $event);
-					break;
-
-				case 'atom':
-					$this->parseAtomFeed($article_node, $event);
-					break;
-			}
-
-			$this->Application->SetVar('m_cat_id', $backup_category_id);
-		}
-
-		/**
-		 * Returns ML field names for article record
-		 *
-		 * @param kCatDBItem $object
-		 * @return Array
-		 */
-		function _getMLFields(&$object)
-		{
-			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
-
-			$title_field = 'Title';
-			$title_formatter = $object->GetFieldOption($title_field, 'formatter');
-
-			if ( $title_formatter == 'kMultiLanguage' ) {
-				$title_field = $ml_formatter->LangFieldName($title_field);
-			}
-
-			$body_field = 'Body';
-			$body_formatter = $object->GetFieldOption($body_field, 'formatter');
-
-			if ( $body_formatter == 'kMultiLanguage' ) {
-				$body_field = $ml_formatter->LangFieldName($body_field);
-			}
-
-			return Array ($title_field, $body_field);
-		}
-
-		/**
-		 * Parses RSS 2.0 feed
-		 *
-		 * @param kXMLNode $root_node
-		 * @param kEvent $event
-		 */
-		function parseRssFeed(&$root_node, $event)
-		{
-			$current_node = $root_node->firstChild;
-			$feed_articles = $this->getFeedArticles($event);
-
-			$object = $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
-			/* @var $object kDBItem */
-
-			list ($title_field, $body_field) = $this->_getMLFields($object);
-
-			do {
-				// IMAGE is information about channel and is not useful here
-				if ($current_node->Name != 'ITEM') continue;
-				// collect item data
-				$data = Array();
-				$sub_node =& $current_node->firstChild;
-				/* @var $sub_node kXMLNode */
-
-				do {
-					if ($sub_node->Name == 'ATOM:SUMMARY') {
-						$data[$sub_node->Name] = $this->getNodeContent($sub_node);
-					} else {
-						$data[$sub_node->Name] = $this->getNodeContent($sub_node, 'xhtml'); // $sub_node->firstChild->Data; // was  $sub_node->Data;
-					}
-
-				} while ( ($sub_node =& $sub_node->NextSibling()) );
-
-				// create/update article
-				$article_crc = crc32($data['LINK'].$data['TITLE']);
-				$article_id = getArrayValue($feed_articles, $article_crc);
-				if ($article_id) {
-					$object->Load($article_id);
-				}
-				else {
-					$object->Clear();
-				}
-
-				$object->SetDBField($title_field, $data['TITLE']);
-				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
-				$object->SetDBField('cust_RssArticleCRC', $article_crc);
-				$object->SetDBField($body_field, !array_key_exists('DESCRIPTION', $data) ? $data['ATOM:SUMMARY'] : $data['DESCRIPTION']);
-				$expiration_time = adodb_mktime() + $event->getEventParam('life_time');
-				$object->SetDBField('EndOn_date', $expiration_time);
-				$object->SetDBField('EndOn_time', $expiration_time);
-				$object->SetDBField('Status', STATUS_ACTIVE);
-				$object->SetDBField('Author', 'root');
-				$object->SetDBField('CreatedById', USER_ROOT);
-
-				$status = $object->isLoaded() ? $object->Update() : $object->Create();
-			} while (($current_node =& $current_node->NextSibling()));
-		}
-
-		/**
-		 * Returns parsed node content
-		 *
-		 * @param kXMLNode $node
-		 * @param string $content_type
-		 * @return string
-		 */
-		function getNodeContent(&$node, $content_type = null)
-		{
-			if ( !isset($content_type) ) {
-				$content_type = $node->GetAttribute('TYPE');
-			}
-
-			switch ($content_type) {
-				case 'xhtml':
-					$data = $node->GetXML(true);
-					break;
-
-				case 'html':
-					$data = kUtil::unhtmlentities( $node->GetXML(true) ); // $node->firstChild->Data // $node->Data
-					break;
-
-				default:
-					$data = $node->GetXML(true); // $node->firstChild->Data; // $node->Data; also for 'text'
-					break;
-			}
-
-			return trim($data);
-		}
-
-		/**
-		 * Parses ATOM feed
-		 *
-		 * @param kXMLNode $root_node
-		 * @param kEvent $event
-		 */
-		function parseAtomFeed(&$root_node, $event)
-		{
-			$current_node = $root_node->firstChild;
-			$feed_articles = $this->getFeedArticles($event);
-
-			$object = $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true));
-			/* @var $object kDBItem */
-
-			list ($title_field, $body_field) = $this->_getMLFields($object);
-
-			do {
-				if ($current_node->Name != 'ENTRY') continue;
-				// collect item data
-				$data = Array();
-				$sub_node =& $current_node->firstChild;
-				/* @var $sub_node kXMLNode */
-
-				do {
-					if ($sub_node->Name == 'LINK') {
-						if ($sub_node->GetAttribute('REL') === false || $sub_node->GetAttribute('REL') == 'alternate') {
-							$data[$sub_node->Name] = $sub_node->GetAttribute('HREF');
-						}
-					}
-					elseif ($sub_node->Name == 'CONTENT' || $sub_node->Name == 'SUMMARY' || $sub_node->Name == 'TITLE') {
-						$data[$sub_node->Name] = $this->getNodeContent($sub_node);
-					}
-					else {
-						$data[$sub_node->Name] = $sub_node->GetXML(true); // firstChild->Data; // $sub_node->Data
-					}
-				} while ( ($sub_node =& $sub_node->NextSibling()) );
-
-				// create/update article
-				$article_crc = crc32($data['LINK'].$data['TITLE']);
-				$article_id = getArrayValue($feed_articles, $article_crc);
-				if ($article_id) {
-					$object->Load($article_id);
-				}
-				else {
-					$object->Clear();
-				}
-
-				$object->SetDBField($title_field, $data['TITLE']);
-				$object->SetDBField('cust_RssOriginalURL', $data['LINK']);
-				$object->SetDBField('cust_RssArticleCRC', $article_crc);
-				$object->SetDBField($body_field, !array_key_exists('CONTENT', $data) ? $data['SUMMARY'] : $data['CONTENT']);
-				$expiration_time = adodb_mktime() + $event->getEventParam('life_time');
-				$object->SetDBField('EndOn_date', $expiration_time);
-				$object->SetDBField('EndOn_time', $expiration_time);
-				$object->SetDBField('Status', STATUS_ACTIVE);
-				$object->SetDBField('Author', 'root');
-				$object->SetDBField('CreatedById', USER_ROOT);
-
-				$status = $object->isLoaded() ? $object->Update() : $object->Create();
-			} while (($current_node =& $current_node->NextSibling()));
-		}
-
-		function getCustomColumns($prefix)
-		{
-			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-			/* @var $ml_formatter kMultiLanguage */
-
-			$custom_fields = array_flip($this->Application->getUnitOption($prefix, 'CustomFields'));
-			foreach ($custom_fields as $custom_name => $custom_id) {
-				$custom_fields[$custom_name] = $ml_formatter->LangFieldName('cust_'.$custom_id);
-			}
-
-			return $custom_fields;
-		}
-
-		/**
-		 * Create missing excerpt
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnBeforeItemUpdate(kEvent $event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-			$this->createExcerpt($event);
-			$this->cacheItemOwner($event, 'CreatedById', 'Author');
-		}
-
-		/**
-		 * Create missing excerpt
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnBeforeItemCreate(kEvent $event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-			$this->createExcerpt($event);
-			$this->cacheItemOwner($event, 'CreatedById', 'Author');
-		}
-
-		/**
-		 * Create excerpt if missing
-		 *
-		 * @param kEvent $event
-		 */
-		function createExcerpt($event)
-		{
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			if ( !$object->GetField('Excerpt') || $this->Application->GetVar('generate_excerpt') ) {
-				$excerpt = strip_tags($object->GetField('Body'));
-
-
-				$length = mb_strlen($excerpt);
-				if ( $length > 100 ) {
-					$excerpt = mb_substr(strip_tags($excerpt), 0, 100);
-
-					if ( mb_substr($excerpt, -1) != ' ' ) {
-						$pos = mb_strrpos($excerpt, ' ');
-
-						if ( $pos ) {
-							$excerpt = mb_substr($excerpt, 0, $pos);
-						}
-					}
-
-					$excerpt .= '...';
-				}
-
-				$excerpt_field = 'Excerpt';
-				$excerpt_formatter = $object->GetFieldOption('Excerpt', 'formatter');
-
-				if ( $excerpt_formatter == 'kMultiLanguage' ) {
-					$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-					/* @var $ml_formatter kMultiLanguage */
-
-					$excerpt_field = $ml_formatter->LangFieldName($excerpt_field);
-				}
-
-				$object->SetDBField($excerpt_field, $excerpt);
-			}
-		}
-
-		/**
-		 * [HOOK] Updates category custom fields options in config
-		 *
-		 * @param kEvent $event
-		 */
-		function OnUpdateCategoryCustomFields($event)
-		{
-			$new_virtual_fields =	Array(
-											'cust_RssSource'				=>	Array('type' => 'string', 'default' => ''),
-											'cust_RssDefaultExpiration'		=>	Array('type' => 'int', 'default' => ''),
-											'cust_RssDefaultExpirationType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month', 29030400 => 'la_opt_year'), 'default' => 60),
-											'cust_RssExpireInterval'		=>	Array('type' => 'int', 'default' => ''),
-											'cust_RssExpireIntervalType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month'), 'default' => 60),
-											'cust_RssDeleteExpired'			=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'default' => 0),
-											'cust_RssUpdateInterval'		=>	Array('type' => 'int', 'default' => ''),
-											'cust_RssUpdateIntervalType'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(60 => 'la_opt_min', 3600 => 'la_opt_hour', 86400 => 'la_opt_day', 2419200 => 'la_opt_month'), 'default' => 60),
-											'cust_RssLastUpdated'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
-											'cust_RssLastExpired'			=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
-									);
-			$virtual_fields = $this->Application->getUnitOption('c', 'VirtualFields');
-			$virtual_fields = kUtil::array_merge_recursive($virtual_fields, $new_virtual_fields);
-			$this->Application->setUnitOption('c', 'VirtualFields', $virtual_fields);
-		}
-
-		/**
-		 * Sets default expiration based on module setting
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnPreCreate(kEvent $event)
-		{
-			parent::OnPreCreate($event);
-
-			if ( $event->status != kEvent::erSUCCESS ) {
-				return ;
-			}
-
-			$object = $event->getObject();
-			/* @var $object kDBItem */
-
-			$archive_days = $this->Application->ConfigValue('News_Archive');
-			if ( $archive_days ) {
-				$expire_date = adodb_mktime() + $archive_days * 3600 * 24;
-				$object->SetDBField('EndOn_date', $expire_date);
-				$object->SetDBField('EndOn_time', $expire_date);
-			}
-		}
-
-		/**
-		 * [HOOK] Allows to add cloned subitem to given prefix
-		 *
-		 * @param kEvent $event
-		 * @return void
-		 * @access protected
-		 */
-		protected function OnCloneSubItem(kEvent $event)
-		{
-			parent::OnCloneSubItem($event);
-
-			if ( $event->MasterEvent->Prefix == 'rev' ) {
-				$clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones');
-				$subitem_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;
-
-				$clones[$subitem_prefix]['ConfigMapping'] = Array (
-					'PerPage'				=>	'Perpage_NewsReviews',
-					'ShortListPerPage'		=>	'Perpage_NewsReviews_Short',
-					'DefaultSorting1Field'	=>	'News_SortReviews',
-					'DefaultSorting2Field'	=>	'News_SortReviews2',
-					'DefaultSorting1Dir'	=>	'News_SortReviewsOrder',
-					'DefaultSorting2Dir'	=>	'News_SortReviewsOrder2',
-
-					'ReviewDelayInterval'	=>	'News_ReviewDelay_Interval',
-					'ReviewDelayValue'		=>	'News_ReviewDelay_Value',
-				);
-
-				$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Clones', $clones);
-			}
-		}
-	}
\ No newline at end of file

Property changes on: releases/5.2.0-B2/units/articles/articles_event_handler.php
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.14.2.13
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/articles_custom.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/articles_custom.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/articles_custom.tpl	(nonexistent)
@@ -1,72 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_custom" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','OnCancelEdit');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				function edit(){ }
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle">
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="ml_selector" prefix="n"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:n_SaveWarning name="grid_save_warning"/>
-<inp2:n_ErrorWarning name="form_error_warning"/>
-
-<inp2:m_include t="incs/custom_blocks"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:cf.all_PrintList render_as="cv_row_block" SourcePrefix="n" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
-
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<input type="hidden" name="cf_type" value="<inp2:n_UnitOption name='ItemType'/>"/>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/articles_custom.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5.2.4
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/relations_edit.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/relations_edit.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/relations_edit.tpl	(nonexistent)
@@ -1,74 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="relations_edit"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n-rel','<inp2:n-rel_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n-rel','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-						go_to_id('n-rel', '<inp2:n-rel_PrevId/>');
-					}
-				));
-
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-						go_to_id('n-rel', '<inp2:n-rel_NextId/>');
-					}
-				));
-
-				a_toolbar.Render();
-				
-				<inp2:m_if check="n-rel_IsSingle">
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n-rel_IsLast">
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n-rel_IsFirst">
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_include t="categories/ci_blocks"/>
-
-<inp2:n-rel_SaveWarning name="grid_save_warning"/>
-<inp2:n-rel_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_section_Relation"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="SourceId"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="SourceType"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="TargetId"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rel" field="TargetType"/>
-
-			<inp2:m_RenderElement name="inp_id_label" prefix="n-rel" field="RelationshipId" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_edit_relation" prefix="n-rel" field="TargetId" title="la_fld_TargetId"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rel" field="Type" title="la_fld_RelationshipType"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-rel" field="Enabled" title="la_fld_Enabled"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rel" field="Priority" title="la_fld_Priority" size="4"/>
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/relations_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4.2.4
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/articles_images.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/articles_images.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/articles_images.tpl	(nonexistent)
@@ -1,107 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_images" pagination="1" pagination_prefix="n-img" tab_preset="Default"/>
-
-<inp2:m_include t="incs/image_blocks"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-
-  				function edit()
-	  			{
-	  				std_edit_temp_item('n-img', 'in-news/articles/images_edit');
-	  			}
-
-  				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','OnCancelEdit');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-
-
-				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('n-img', 'in-news/articles/images_edit')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-img')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
-							submit_event('n-img','OnMassMoveUp');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
-							submit_event('n-img','OnMassMoveDown');
-						}
-				 ) );
-
-				 a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
-							submit_event('n-img','OnSetPrimary');
-						}
-				 ) );
-
-				  a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
-							show_viewmenu(a_toolbar,'view');
-						}
-				) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-img" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-img" IdField="ImageId" grid="Default"/>
-<script type="text/javascript">
-	Grids['n-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') );
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/articles_images.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5.2.4
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/articles_relations.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/articles_relations.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/articles_relations.tpl	(nonexistent)
@@ -1,105 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_relations" pagination="1" pagination_prefix="n-rel" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','OnCancelEdit');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				//Relations related:
-				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('n-rel', '<inp2:adm_SelectorLink prefix="n-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
-						} ) );
-
-				function edit()
-	  			{
-	  				std_edit_temp_item('n-rel', 'in-news/articles/relations_edit');
-	  			}
-
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-rel')
-						} ) );
-
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
-							submit_event('n-rel','OnMassApprove');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
-							submit_event('n-rel','OnMassDecline');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
-
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
-							show_viewmenu(a_toolbar,'view');
-						}
-				) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-rel" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-rel" IdField="RelationshipId" grid="Default"/>
-<script type="text/javascript">
-	Grids['n-rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
-</script>
-<input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
-<input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
-<inp2:m_include t="incs/footer"/>
-
-<script type="text/javascript">
-	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
-</script>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/articles_relations.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.3
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/file_edit.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/file_edit.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/file_edit.tpl	(nonexistent)
@@ -1,66 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="file_edit"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n-file','<inp2:n-file_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n-file','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-						go_to_id('n-file', '<inp2:n-file_PrevId/>');
-					}
-				));
-
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-						go_to_id('n-file', '<inp2:n-file_NextId/>');
-					}
-				));
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n-file_IsSingle">
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n-file_IsLast">
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n-file_IsFirst">
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:n-file_SaveWarning name="grid_save_warning"/>
-<inp2:n-file_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_section_File"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-file" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-file" field="FileName" title="la_fld_Name" size="50" />
-			<inp2:m_RenderElement name="inp_edit_upload" prefix="n-file" field="FilePath" title="la_fld_FilePath" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-file" field="Status" title="la_fld_Enabled" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/file_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.5
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/articles_edit.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/articles_edit.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/articles_edit.tpl	(nonexistent)
@@ -1,132 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_edit" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','OnCancelEdit');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				//a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-					//a_toolbar.HideButton('sep2');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-
-<inp2:n_SaveWarning name="grid_save_warning"/>
-<inp2:n_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Article" original_title="la_section_OriginalValues" display_original="1"/>
-
-			<inp2:m_RenderElement name="inp_id_label" prefix="n" field="NewsId" title="la_fld_Id" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Title" title="la_fld_Title" size="70" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="n" field="CreatedById" title="la_fld_Author" size="25" display_original="1"/>
-
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="la_fld_Body" control_options="{min_height: 100}" cols="70" rows="8" display_original="1"/>
-
-			<!-- excerpt: begin -->
-			<inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" title="la_fld_Excerpt">
-				<td class="control-cell">
-					<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br />
-					<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
-				</td>
-			</inp2:m_RenderElement>
-			<!-- excerpt: end -->
-
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Filename" title="la_fld_Filename" size="70" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="n" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
-		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_if check="n_DisplayOriginal" display_original="1">
-				<inp2:m_RenderElement design="form_row" prefix="n" field="Status" title="la_fld_Status">
-					<td class="control-cell">
-						<inp2:m_Phrase label="la_UseGridToApproveDecline" />
-					</td>
-				</inp2:m_RenderElement>
-			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="Status" title="la_fld_Status" display_original="1"/>
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="NewItem" title="la_fld_New" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="HotItem" title="la_fld_Hot" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="PopItem" title="la_fld_Pop" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="EditorsPick" title="la_fld_EditorsPick" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadStory" title="la_fld_LeadStory" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="LeadCatStory" title="la_fld_LeadCatStory" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Priority" title="la_fld_Priority" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="CreatedOn" title="la_fld_CreatedOn" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="StartDate" title="la_fld_StartDate" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n" field="EndOn" title="la_fld_EndOn" display_original="1"/>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="MetaKeywords" title="la_fld_MetaKeywords" size="70"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="MetaDescription" title="la_fld_MetaDescription" control_options="{min_height: 100}" cols="70" rows="5"/>
-
-		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Counters" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedRating" title="la_fld_Rating" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="CachedVotesQty" title="la_fld_Votes" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Hits" title="la_fld_Hits" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
-			<input type="hidden" name="Hits_original" id="Hits_original" value="<inp2:n_Field name="Hits" db="db" />" />
-
-		<!-- custom fields: begin -->
-		<inp2:m_include t="incs/custom_blocks"/>
-		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="n" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
-		<!-- custom fields: end -->
-
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<script type="text/javascript">
-	$(document).ready(reflect_filename);
-	disable_categories('<inp2:n_InputName name="CategoryId"/>', <inp2:n_AllowedCategoriesJSON/>);
-
-	function reflect_filename() {
-    	var $checked = document.getElementById('_cb_<inp2:n_InputName field="AutomaticFilename"/>').checked;
-    	document.getElementById('<inp2:n_InputName field="Filename"/>').readOnly = $checked;
-    }
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/articles_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6.2.10
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/articles_files.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/articles_files.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/articles_files.tpl	(nonexistent)
@@ -1,86 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_files" pagination="1" pagination_prefix="n-file" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-
-  				function edit()
-	  			{
-	  				std_edit_temp_item('n-file', 'in-news/articles/file_edit');
-	  			}
-
-  				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','OnCancelEdit');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewFile" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-						function() {
-							std_new_item('n-file', 'in-news/articles/file_edit')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-file')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
-							show_viewmenu(a_toolbar,'view');
-						}
-				) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-file" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-file" IdField="FileId" grid="Default"/>
-<script type="text/javascript">
-	Grids['n-file'].SetDependantToolbarButtons( new Array('edit','delete') );
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/articles_files.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.6
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/articles_reviews.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/articles_reviews.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/articles_reviews.tpl	(nonexistent)
@@ -1,114 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_reviews" pagination="1" pagination_prefix="n-rev" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','OnCancelEdit');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				//Pricing related:
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewReview" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-						function() {
-							std_new_item('n-rev', 'in-news/articles/review_edit')
-						} ) );
-
-				function edit()
-	  			{
-	  				std_edit_temp_item('n-rev', 'in-news/articles/review_edit');
-	  			}
-
-				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-rev')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
-				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
-							submit_event('n-rev','OnMassApprove');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
-							submit_event('n-rev','OnMassDecline');
-						}
-				 ) );
-
-				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('n-rev','OnMassMoveUp');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
-							submit_event('n-rev','OnMassMoveDown');
-						}
-				 ) );
-
-				 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');
-						}
-				) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-rev" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_DefineElement name="reviewtext_checkbox_td">
-	<inp2:Field field="$field" no_special="no_special" cut_first="100"/>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-rev" IdField="ReviewId" grid="Default"/>
-<script type="text/javascript">
-	Grids['n-rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/articles_reviews.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.3
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/images_edit.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/images_edit.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/images_edit.tpl	(nonexistent)
@@ -1,85 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="images_edit"/>
-
-<inp2:m_include t="incs/image_blocks"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n-img','<inp2:n-img_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n-img','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-					go_to_id('n-img', '<inp2:n-img_PrevId/>');
-					}
-				));
-	
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-						go_to_id('n-img', '<inp2:n-img_NextId/>');
-					}
-				));
-	
-				a_toolbar.Render();
-				
-				<inp2:m_if check="n-img_IsSingle">
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n-img_IsLast">
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n-img_IsFirst">
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:n-img_SaveWarning name="grid_save_warning"/>
-<inp2:n-img_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_section_Image"/>
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-img" field="ResourceId"/>
-			<inp2:m_RenderElement name="inp_label" prefix="n-img" field="ImageId" title="la_fld_Id"/>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Name" title="la_fld_Name" size="40"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="AltName" title="la_fld_AltValue" size="40"/>
-
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-img" field="Priority" title="la_fld_Priority" size="5"/>
-
-		<inp2:m_RenderElement name="subsection" title="la_section_ThumbnailImage"/>
-			<inp2:m_RenderElement name="thumbnail_section" prefix="n-img"/>
-
-		<inp2:m_RenderElement name="subsection" title="la_section_FullSizeImage"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n-img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
-			<inp2:m_RenderElement name="fullsize_section" prefix="n-img"/>
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<script type="text/javascript">
-	<inp2:m_RenderElement name="images_edit_js" prefix="n-img"/>
-	toggle_fullsize();
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/images_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5.2.4
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/articles_categories.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/articles_categories.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/articles_categories.tpl	(nonexistent)
@@ -1,84 +0,0 @@
-<inp2:adm_SetPopupSize width="880" height="680"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="articles_categories" pagination="1" pagination_prefix="n-ci" tab_preset="Default"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-  				function edit(){ }
-
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n','<inp2:n_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n','OnCancelEdit');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_PrevId/>');
-						}
-				 ) );
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('n', '<inp2:n_NextId/>');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
-				//Category related:
-				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-						function() {
-							openSelector('n', '<inp2:adm_SelectorLink prefix="n" selection_mode="multi" tab_prefixes="none"/>', 'ItemCategory');
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-						function() {
-							std_delete_items('n-ci')
-						} ) );
-
-				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
-							submit_event('n-ci','OnSetPrimary');
-						}
-				 ) );
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-
-		<inp2:m_RenderElement name="search_main_toolbar" prefix="n-ci" grid="Default"/>
-	</tr>
-</tbody>
-</table>
-
-<inp2:m_DefineElement name="grid_checkbox_category_td">
-	<inp2:CategoryName field="$field" primary_title="la_PrimaryCategory" no_special="1"/>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement name="grid" PrefixSpecial="n-ci" IdField="CategoryId" grid="Default"/>
-<script type="text/javascript">
-	Grids['n-ci'].SetDependantToolbarButtons( new Array('delete','setprimary') );
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/articles_categories.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.4
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/articles/review_edit.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/articles/review_edit.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/articles/review_edit.tpl	(nonexistent)
@@ -1,75 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n" section="in-portal:browse" title_preset="reviews_edit"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('n-rev','<inp2:n-rev_SaveEvent/>');
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n-rev','OnCancel');
-						}
-				 ) );
-
-				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-						go_to_id('n-rev', '<inp2:n-rev_PrevId/>');
-					}
-				));
-
-				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-						go_to_id('n-rev', '<inp2:n-rev_NextId/>');
-					}
-				));
-
-				a_toolbar.Render();
-
-				<inp2:m_if check="n-rev_IsSingle" >
-					a_toolbar.HideButton('prev');
-					a_toolbar.HideButton('next');
-					a_toolbar.HideButton('sep1');
-				<inp2:m_else/>
-					<inp2:m_if check="n-rev_IsLast" >
-						a_toolbar.DisableButton('next');
-					</inp2:m_if>
-					<inp2:m_if check="n-rev_IsFirst" >
-						a_toolbar.DisableButton('prev');
-					</inp2:m_if>
-				</inp2:m_if>
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<inp2:n-rev_SaveWarning name="grid_save_warning"/>
-<inp2:n-rev_ErrorWarning name="form_error_warning"/>
-
-<inp2:m_RenderElement name="inp_edit_hidden" prefix="n-rev" field="ItemId"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_Text_Review"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="n-rev" field="TextFormat"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="n-rev" field="ReviewId" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="n-rev" field="CreatedById" title="la_fld_CreatedById" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n-rev" field="ReviewText" title="la_fld_ReviewText" cols="70" rows="8"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rev" field="HelpfulCount" title="la_fld_HelpfulCount" style="width: 50px;"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rev" field="NotHelpfulCount" title="la_fld_NotHelpfulCount" style="width: 50px;"/>
-
-		<inp2:m_RenderElement name="subsection" title="la_Text_General"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n-rev" field="Status" title="la_fld_Status"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n-rev" field="Priority" title="la_fld_Priority" size="3" class="text"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="n-rev" field="CreatedOn" title="la_fld_CreatedOn" size="20" class="text"/>
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/articles/review_edit.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.3
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/category_properties.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/category_properties.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/category_properties.tpl	(nonexistent)
@@ -1,28 +0,0 @@
-<inp2:m_RenderElement name="subsection" title="la_In-news"/>
-
-<inp2:m_DefineElement name="inp_edit_type" class="" is_last="" maxlength="" onblur="" size="" is_last="" has_empty="0" empty_value="" onchange="" hint_label="" type_field="">
-	<inp2:m_RenderElement design="form_row" pass_params="1">
-		<td class="control-cell">
-			<input type="text" name="<inp2:{$prefix}_InputName field="$field" />" id="<inp2:{$prefix}_InputName field="$field" />" value="<inp2:{$prefix}_Field field="$field" />" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
-
-			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>">
-				<inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases">
-					<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				<inp2:m_else/>
-					<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				</inp2:m_if>
-			</select>
-		</td>
-	</inp2:m_RenderElement>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="la_fld_cust_n_ItemTemplate" size="50"/>
-
-<inp2:m_RenderElement name="subsection" title="la_section_RssProperties"/>
-<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_RssSource" type_field="cust_RssSource" title="la_fld_RssSource" size="50"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssUpdateInterval" type_field="cust_RssUpdateIntervalType" title="la_fld_RssUpdateInterval" has_empty="1"/>
-
-<inp2:m_RenderElement name="subsection" title="la_section_RssExpiration"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssDefaultExpiration" type_field="cust_RssDefaultExpirationType" title="la_fld_RssDefaultExpiration" has_empty="1"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssExpireInterval" type_field="cust_RssExpireIntervalType" title="la_fld_RssExpireInterval" has_empty="1"/>
-<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="cust_RssDeleteExpired" title="la_fld_RssDeleteExpired"/>

Property changes on: releases/5.2.0-B2/admin_templates/category_properties.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3.2.3
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/catalog_tab.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/catalog_tab.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/catalog_tab.tpl	(nonexistent)
@@ -1,65 +0,0 @@
-<inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
-<inp2:m_DefineElement name="catalog_tab">
-	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
-			a_toolbar.AddButton(
-				new ToolBarButton(
-					'in-news:new_article',
-					'<inp2:m_phrase label="la_ToolTip_NewArticle" escape="1"/>',
-					add_item,
-					true
-		 		)
-		 	);
-		</inp2:m_if>
-
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-			<div id="articles_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-news/catalog_tab"  edit_template="in-news/articles/articles_edit" category_id="-1" dep_buttons="new_article" class="catalog-tab"><!-- IE minimal height problem fix --></div>
-			<script type="text/javascript">$Catalog.registerTab('articles');</script>
-		</inp2:m_if>
-
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="3">
-			$Catalog.setItemCount('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount grid="$grid_name"/>');
-		</inp2:m_if>
-	<inp2:m_else/>
-		<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
-		<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
-		<inp2:m_include t="incs/blocks"/>
-		<inp2:m_include t="incs/in-portal"/>
-		<inp2:m_include t="categories/ci_blocks"/>
-		<inp2:$prefix_InitList grid="$grid_name"/>
-
-		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
-		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
-
-		<inp2:m_DefineElement name="article_expire_td" no_special="">
-			<inp2:m_if check="Field" name="$field">
-				<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
-			<inp2:m_else/>
-				<inp2:m_phrase name="la_Never"/>
-			</inp2:m_if>
-		</inp2:m_DefineElement>
-
-		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
-		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
-
-		<inp2:m_if check="m_ParamEquals" name="tab_dependant" value="yes">
-			Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true);
-		</inp2:m_if>
-		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
-		<inp2:m_RenderElement name="reflect_catalog_buttons"/>
-
-		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
-		<inp2:m_if check="m_ParamEquals" name="tab_mode" value="single">
-			Grids['<inp2:m_param name="prefix"/>'].DblClick = function() {return false};
-		</inp2:m_if>
-		#separator#
-		<!-- articles tab: begin -->
-		<inp2:m_RenderElement name="kernel_form" form_name="articles_form"/>
-		<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
-		<inp2:m_RenderElement name="kernel_form_end"/>
-		<!-- articles tab: end -->
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/catalog_tab.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.12.2.4
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/export_progress.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/export_progress.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/export_progress.tpl	(nonexistent)
@@ -1,14 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
-
-<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
-
-<script type="text/javascript">
-	function cancel_action() {
-		submit_event('n.export', 'OnExportCancel');
-	}
-
-	$LinkExport = new AjaxProgressBar('<inp2:m_t t="dummy" n.export_event="OnExportProgress" pass="m,n.export" js_escape="1"/>');
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/export_progress.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.3
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/export.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/export.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/export.tpl	(nonexistent)
@@ -1,123 +0,0 @@
-<inp2:adm_SetPopupSize width="780" height="670"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-						document.getElementById('hidden_export_columns').value = select_to_string('<inp2:n.export_InputName field="ExportColumns"/>');
-						submit_event('n.export','OnExportBegin');
-
-						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('n.export','OnGoBack');
-						}
-				 ) );
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-
-<inp2:n.export_SaveWarning name="grid_save_warning"/>
-<inp2:n.export_ErrorWarning name="form_error_warning"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.export" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.export" field="LineEndingsInside" title="la_fld_LineEndingsInside" use_phrases="0"/>
-
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>
-
-			<inp2:m_RenderElement design="form_row" prefix="n.export" field="ExportColumns" title="la_fld_ExportColumns">
-				<td class="control-cell">
-					<table cellpadding="0" cellspacing="0" border="0">
-						<tr>
-							<td>
-								<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" onclick="move_options_up('<inp2:n.export_InputName field="ExportColumns"/>', 1)" class="button">
-								<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" onclick="move_options_down('<inp2:n.export_InputName field="ExportColumns"/>', 1)" class="button"><br />
-								<img src="img/spacer.gif" width="1" height="5" alt=""><br />
-							</td>
-							<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
-							<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
-						</tr>
-						<tr>
-							<td>
-								<select multiple id="<inp2:n.export_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
-									<inp2:n.export_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
-								</select>
-								<input type="hidden" id="hidden_export_columns" name="<inp2:n.export_InputName field="ExportColumns"/>" value="<inp2:n.export_Field field="ExportColumns"/>" />
-							</td>
-							<td align="center">
-								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" onclick="move_selected('<inp2:n.export_InputName field="AvailableColumns"/>', '<inp2:n.export_InputName field="ExportColumns"/>')" class="button"><br>
-								<img src="img/spacer.gif" width="1" height="4" alt=""><br>
-								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" onclick="move_selected('<inp2:n.export_InputName field="ExportColumns"/>', '<inp2:n.export_InputName field="AvailableColumns"/>'); select_sort('<inp2:n.export_InputName field="AvailableColumns"/>');" class="button">
-							</td>
-							<td>
-								<select multiple id="<inp2:n.export_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
-									<inp2:n.export_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
-								</select>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</inp2:m_RenderElement>
-
-			<inp2:m_RenderElement design="form_row" prefix="n.export" field="CategoryFormat" title="la_fld_CategoryFormat">
-				<td class="control-cell">
-					<table cellspacing="0" cellpadding="0">
-						<tr>
-							<td rowspan="2" valign="top">
-								<input type="radio"<inp2:m_if check="n.export_FieldEquals" field="CategoryFormat" value="1"> checked</inp2:m_if> name="<inp2:n.export_InputName field="CategoryFormat"/>" id="<inp2:n.export_InputName field="CategoryFormat"/>_1" value="1" />
-							</td>
-							<td>
-								<label for="<inp2:n.export_InputName field="CategoryFormat"/>_1"><inp2:m_phrase label="la_MixedCategoryPath"/></label>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<span class="<inp2:m_if check="n.export_HasError" field="CategorySeparator">error</inp2:m_if>"><inp2:m_phrase name="la_fld_CategorySeparator"/></span><inp2:m_if check="n.export_IsRequired" field="CategorySeparator"><span class="error"> *</span></inp2:m_if>:
-								 <input type="text" name="<inp2:n.export_InputName field="CategorySeparator"/>" id="<inp2:n.export_InputName field="CategorySeparator"/>" value="<inp2:n.export_Field field="CategorySeparator"/>" size="2" maxlength="1" /><br />
-								(will look like "Category:Sub-category:Sub-sub-category")
-
-							</td>
-						</tr>
-
-						<tr>
-							<td rowspan="2" valign="top">
-								<input type="radio"<inp2:m_if check="n.export_FieldEquals" field="CategoryFormat" value="2"> checked</inp2:m_if> name="<inp2:n.export_InputName field="CategoryFormat"/>" id="<inp2:n.export_InputName field="CategoryFormat"/>_2" value="2" />
-							</td>
-							<td>
-								<label for="<inp2:n.export_InputName field="CategoryFormat"/>_2"><inp2:m_phrase label="la_SeparatedCategoryPath"/></label><br />
-								(the fields will be titled Category1..CategoryN accordingly)
-							</td>
-						</tr>
-					</table>
-				</td>
-			</inp2:m_RenderElement>
-
-			<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" />
-			</inp2:m_if>
-
-			<inp2:m_RenderElement name="inp_edit_box" prefix="n.export" field="ExportFilename" title="la_fld_ExportFilename" size="20" />
-			<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/export.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.5
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/import_progress.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/import_progress.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/import_progress.tpl	(nonexistent)
@@ -1,14 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n.import" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_import"/>
-
-<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
-
-<script type="text/javascript">
-	function cancel_action() {
-		submit_event('n.import', 'OnExportCancel');
-	}
-
-	$LinkImport = new AjaxProgressBar('<inp2:m_t t="dummy" n.import_event="OnExportProgress" pass="m,n.import" js_escape="1"/>');
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/import_progress.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.4
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/import.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/import.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/import.tpl	(nonexistent)
@@ -1,223 +0,0 @@
-<inp2:adm_SetPopupSize width="780" height="670"/>
-
-<inp2:m_include t="incs/header"/>
-<inp2:n.import_PresetFormFields/>
-<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:main_import" title_preset="import"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-
-				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-						location.href = '<inp2:m_Link t="tools/import2"/>';
-					}
-				) );
-
-				a_toolbar.AddButton( new ToolBarButton('import', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
-
-						document.getElementById('export_columns').value = select_to_string('<inp2:n.import_InputName field="ExportColumns"/>');
-						submit_event('n.import','OnExportBegin');
-
-						}
-					) );
-
-				a_toolbar.Render();
-
-				function check_radio($id)
-				{
-					document.getElementById($id).checked = true;
-				}
-
-				// gets value of checked radio button
-				function get_checked($field_name) {
-					var $ret = false;
-					var $fields = document.getElementsByName($field_name);
-
-					for(var $i = 0; $i < $fields.length; $i++) {
-						if ($fields[$i].checked) {
-							$ret = $fields[$i].value;
-							break;
-						}
-					}
-					return $ret;
-				}
-
-				// enable/disable form fields based on other field values
-				function reflectFormFields()
-				{
-					var $auto_fields = get_checked('<inp2:n.import_InputName field="FieldTitles"/>') == 1 ? true : false;
-
-					if ($auto_fields) {
-						document.getElementById('_cb_<inp2:n.import_InputName field="SkipFirstRow"/>').checked = true;
-					}
-					document.getElementById('_cb_<inp2:n.import_InputName field="SkipFirstRow"/>').onchange();
-					document.getElementById('<inp2:n.import_InputName field="ExportColumns"/>').disabled = $auto_fields;
-					document.getElementById('<inp2:n.import_InputName field="AvailableColumns"/>').disabled = $auto_fields;
-
-					var $btn = null;
-					var $btns = Array('up', 'down', 'left', 'right');
-					var $i = 0;
-					while ($i < $btns.length) {
-						$btn = document.getElementById('btn_move_'+$btns[$i]);
-						$btn.disabled = $auto_fields;
-						$btn.className = $auto_fields ? 'button-disabled' : 'button';
-						$i++;
-					}
-				}
-
-				Application.setHook('n.import:OnBeforeOpenSelector',
-					function() {
-						document.getElementById('export_columns').value = select_to_string('<inp2:n.import_InputName field="ExportColumns"/>');
-					}
-				);
-
-				$(document).ready(
-					function() {
-						$('#step_number').text(3);
-					}
-				);
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-
-<inp2:n.import_SaveWarning name="grid_save_warning"/>
-<inp2:n.import_ErrorWarning name="form_error_warning"/>
-
-<table class="edit-form bordered">
-	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-		<inp2:m_RenderElement design="form_row" prefix="n.import" field="ImportSource" title="la_fld_ImportFilename">
-			<td class="control-cell">
-				<table border="0">
-					<tr>
-						<td>
-							<input type="radio" name="<inp2:n.import_InputName field="ImportSource"/>" id="<inp2:n.import_InputName field="ImportSource"/>_1"<inp2:m_if check="n.import_FieldEquals" field="ImportSource" value="1"> checked</inp2:m_if> value="1" />
-						</td>
-						<td>
-							<label for="<inp2:n.import_InputName field="ImportSource"/>_1">upload</label>
-						</td>
-						<td>
-							<input type="file" name="<inp2:n.import_InputName field="ImportFilename"/>" id="<inp2:n.import_InputName field="ImportFilename"/>" onclick="check_radio('<inp2:n.import_InputName field="ImportSource"/>_1');">
-						</td>
-					</tr>
-
-					<tr>
-						<td>
-							<input type="radio" name="<inp2:n.import_InputName field="ImportSource"/>" id="<inp2:n.import_InputName field="ImportSource"/>_2"<inp2:m_if check="n.import_FieldEquals" field="ImportSource" value="2"> checked</inp2:m_if> value="2" />
-						</td>
-						<td>
-							<label for="<inp2:n.import_InputName field="ImportSource"/>_2">select</label>
-						</td>
-						<td>
-							<select name="<inp2:n.import_InputName field="ImportLocalFilename"/>" onclick="check_radio('<inp2:n.import_InputName field="ImportSource"/>_2');">
-								<inp2:n.import_PredefinedOptions field="ImportLocalFilename" block="inp_option_item" selected="selected"/>
-							</select>
-						</td>
-					</tr>
-
-				</table>
-			</td>
-		</inp2:m_RenderElement>
-
-		<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="n.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
-		<inp2:m_RenderElement name="inp_edit_radio" prefix="n.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
-
-		<inp2:m_RenderElement design="form_row" prefix="n.import" field="ExportColumns" title="la_fld_ImportColumns">
-			<td class="control-cell">
-				<table cellpadding="0" cellspacing="0" border="0">
-					<tr>
-						<td>
-							<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" id="btn_move_up" onclick="move_options_up('<inp2:n.import_InputName field="ExportColumns"/>', 1)" class="button">
-							<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" id="btn_move_down" onclick="move_options_down('<inp2:n.import_InputName field="ExportColumns"/>', 1)" class="button"><br />
-							<img src="img/spacer.gif" width="1" height="5" alt=""><br />
-						</td>
-						<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
-						<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
-					</tr>
-					<tr>
-						<td>
-							<select multiple id="<inp2:n.import_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
-								<inp2:n.import_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
-							</select>
-							<input type="hidden" id="export_columns" name="<inp2:n.import_InputName field="ExportColumns"/>" value="<inp2:n.import_Field field="ExportColumns"/>" />
-						</td>
-						<td align="center">
-							<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" id="btn_move_left" onclick="move_selected('<inp2:n.import_InputName field="AvailableColumns"/>', '<inp2:n.import_InputName field="ExportColumns"/>')" class="button"><br>
-							<img src="img/spacer.gif" width="1" height="4" alt=""><br>
-							<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" id="btn_move_right" onclick="move_selected('<inp2:n.import_InputName field="ExportColumns"/>', '<inp2:n.import_InputName field="AvailableColumns"/>'); select_sort('<inp2:n.import_InputName field="AvailableColumns"/>');" class="button">
-						</td>
-						<td>
-							<select multiple id="<inp2:n.import_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
-								<inp2:n.import_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
-							</select>
-						</td>
-					</tr>
-				</table>
-			</td>
-		</inp2:m_RenderElement>
-
-<!-- CATEGORY SELECTOR: BEGIN -->
-	<inp2:m_DefineElement name="root_cat_caption">
-		<inp2:m_Phrase name="la_rootcategory_name"/>
-	</inp2:m_DefineElement>
-
-	<inp2:m_DefineElement name="category_caption">
-		<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
-	</inp2:m_DefineElement>
-
-	<inp2:m_RenderElement design="form_row" prefix="n.import" field="CategoryId" title="la_fld_ImportCategory">
-		<td class="control-cell">
-			<b><inp2:n.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
-			<input type="hidden" name="<inp2:n.import_InputName field='CategoryId'/>" value="<inp2:n.import_Field field='CategoryId' db='db'/>" />
-			<a href="javascript:openSelector('n.import', '<inp2:adm_SelectorLink prefix="n.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
-		</td>
-	</inp2:m_RenderElement>
-<!-- CATEGORY SELECTOR: END -->
-
-	<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
-	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
-
-	<inp2:m_RenderElement design="form_row" prefix="n.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
-		<td class="control-cell">
-			<table cellspacing="0" cellpadding="0">
-				<tr>
-					<td valign="top">
-						<input type="radio"<inp2:m_if check="n.import_FieldEquals" field="CheckDuplicatesMethod" value="1"> checked</inp2:m_if> name="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_1" value="1" />
-					</td>
-					<td>
-						<label for="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_1"><inp2:m_phrase name="la_IDField" />: ARTICLEID</label>
-					</td>
-				</tr>
-
-				<tr>
-					<td valign="top">
-						<input type="radio"<inp2:m_if check="n.import_FieldEquals" field="CheckDuplicatesMethod" value="2"> checked</inp2:m_if> name="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_2" value="2" />
-					</td>
-					<td>
-						<label for="<inp2:n.import_InputName field="CheckDuplicatesMethod"/>_2"><inp2:m_phrase name="la_OtherFields" />: </label>
-						<inp2:n.import_PredefinedOptions prefix="n.import" field="DuplicateCheckFields" block="inp_checkbox_item" selected="checked"/>
-
-						<inp2:m_RenderElement prefix="n.import" name="inp_edit_hidden" field="DuplicateCheckFields"/>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</inp2:m_RenderElement>
-
-	<inp2:m_RenderElement name="inp_edit_filler"/>
-</table>
-
-<script language="javascript" type="text/javascript">
-	reflectFormFields();
-</script>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/import.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.7
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/export_finish.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/export_finish.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/export_finish.tpl	(nonexistent)
@@ -1,43 +0,0 @@
-<inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="n.export" section="in-portal:browse" perm_section="NEWS" permission_type="VIEW" system_permission="0" title_preset="articles_export"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
-
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
-							submit_event('n.export', 'OnGoBack');
-						}
-				 ) );
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
-</table>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
-
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_inc param="tab_index" by="1"/>
-			<td class="label-cell">
-				<inp2:m_phrase label="la_DownloadExportFile"/>
-			</td>
-			<td class="control-mid">&nbsp;</td>
-			<td class="control-cell">
-				<a href="<inp2:n.export_ExportPath as_url="1"/>"><inp2:n.export_ExportPath /></a>
-			</td>
-		</tr>
-
-		<inp2:m_RenderElement name="inp_edit_filler"/>
-	</table>
-</div>
-
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/export_finish.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.6
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/toolbar/tool_new_article_f2.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/toolbar/tool_new_article_f2.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/toolbar/tool_new_article_f3.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/toolbar/tool_new_article_f3.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/toolbar/tool_new_article.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/toolbar/tool_new_article.gif
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/icons/icon24_articles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/icons/icon24_articles.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/icons/icon24_conf_news.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/icons/icon24_conf_news.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_articles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_articles.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_article_new.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_article_new.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_article_pending.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_article_pending.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_article_disabled.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_article_disabled.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_article.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.0-B2/admin_templates/img/itemicons/icon16_article.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: releases/5.2.0-B2/admin_templates/user_item_tab.tpl
===================================================================
--- releases/5.2.0-B2/admin_templates/user_item_tab.tpl	(revision 15202)
+++ releases/5.2.0-B2/admin_templates/user_item_tab.tpl	(nonexistent)
@@ -1,43 +0,0 @@
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
-<inp2:m_DefineElement name="catalog_tab">
-	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
-			<div id="articles_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-news/user_item_tab" edit_template="in-news/articles/articles_edit" dep_buttons="new_article" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
-			<script type="text/javascript">$Catalog.registerTab('articles');</script>
-		</inp2:m_if>
-		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
-			<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
-		</inp2:m_if>
-	<inp2:m_else/>
-
-		<inp2:m_include t="incs/blocks"/>
-		<inp2:m_include t="incs/in-portal"/>
-		<inp2:m_include t="categories/ci_blocks"/>
-		<inp2:$prefix_InitList grid="$grid_name"/>
-
-		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
-		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
-
-		<inp2:m_DefineElement name="article_expire_td" no_special="">
-			<inp2:m_if check="Field" name="$field">
-				<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
-			<inp2:m_else/>
-				<inp2:m_phrase name="la_Never"/>
-			</inp2:m_if>
-		</inp2:m_DefineElement>
-
-		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
-
-		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
-		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
-		#separator#
-		<!-- articles tab: begin -->
-		<inp2:m_RenderElement name="kernel_form" form_name="articles_form"/>
-			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="NewsId" grid="$grid_name" menu_filters="yes"/>
-		<inp2:m_RenderElement name="kernel_form_end"/>
-		<!-- articles tab: end -->
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:n_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
\ No newline at end of file

Property changes on: releases/5.2.0-B2/admin_templates/user_item_tab.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.6
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: releases/5.2.0-B2
===================================================================
--- releases/5.2.0-B2	(revision 15202)
+++ releases/5.2.0-B2	(nonexistent)

Property changes on: releases/5.2.0-B2
___________________________________________________________________
Deleted: bugtraq:logregex
## -1,2 +0,0 ##
-(?:[Bb]ugs?|[Ii]ssues?|[Rr]eports?|[Ff]ixe?s?|[Rr]esolves?)+\s+(?:#?(?:\d+)[,\.\s]*)+
-(\d+)
\ No newline at end of property
Deleted: bugtraq:url
## -1 +0,0 ##
-http://tracker.in-portal.org/view.php?id=%BUGID%
\ No newline at end of property
Deleted: bugtraq:warnifnoissue
## -1 +0,0 ##
-false
\ No newline at end of property
Deleted: svn:mergeinfo
## -0,10 +0,0 ##
   Reverse-merged /modules/in-news/releases/5.0.2:r13077-13095
   Reverse-merged /modules/in-news/releases/5.1.1:r14074-14090
   Reverse-merged /modules/in-news/branches/5.0.x:r12747-13722
   Reverse-merged /modules/in-news/releases/5.0.3:r13508-13550
   Reverse-merged /modules/in-news/releases/5.1.2:r14310-14570
   Reverse-merged /in-news/releases/5.0.1:r12619-12655
   Reverse-merged /modules/in-news/branches/5.1.x:r13843-14549
   Reverse-merged /modules/in-news/releases/5.0.4:r13723-13746
   Reverse-merged /modules/in-news/releases/5.1.3:r14550-14583
   Reverse-merged /in-news/branches/5.0.x:r12119-12746
Deleted: tsvn:autoprops
## -1,19 +0,0 ##
-*.php = svn:eol-style=LF;svn:keywords=Id
-*.tpl = svn:eol-style=LF
-*.sql = svn:eol-style=LF
-*.lang = svn:eol-style=LF
-*.sh = svn:eol-style=LF;svn:executable
-*.txt = svn:eol-style=LF
-*.html = svn:eol-style=LF
-*.htm = svn:eol-style=LF
-*.css = svn:eol-style=LF
-*.js = svn:eol-style=LF
-*.xml = svn:eol-style=LF
-.htaccess = svn:eol-style=LF
-.smsignore = svn:eol-style=LF
-COPYRIGHT = svn:eol-style=LF
-CREDITS = svn:eol-style=LF
-INSTALL = svn:eol-style=LF
-LICENSE = svn:eol-style=LF
-LICENSES = svn:eol-style=LF
-README = svn:eol-style=LF
\ No newline at end of property