in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Sun, Jul 20, 9:04 AM

in-portal
View Options

	Index: branches/RC/core/kernel/nparser/compiler.php
	===================================================================
	--- branches/RC/core/kernel/nparser/compiler.php (revision 11213)
	+++ branches/RC/core/kernel/nparser/compiler.php (revision 11214)
	@@ -1,90 +1,116 @@
	<?php

	class NParserCompiler extends kHelper {

	var $Errors = array();
	var $Templates = array();

	function CompileTemplatesStep()
	{
	$templates = $this->Application->RecallVar('templates_to_compile');
	if (!$templates) {
	// build $templates
	$templates = $this->FindTemplates();
	}
	else {
	$templates = unserialize($templates);
	}
	$total = count($templates);
	$current = $this->Application->RecallVar('current_template_to_compile');
	if (!$current) $current = 0;

	if ($errors = $this->Application->RecallVar('compile_errors')) {
	$this->Errors = unserialize($errors);
	}

	$save_handler = $this->Application->errorHandlers[0];
	$this->Application->errorHandlers[0] = array(&$this, 'SaveError');

	- safeDefine('DBG_NPARSER_FORCE_COMPILE',1);
	+ safeDefine('DBG_NPARSER_FORCE_COMPILE', 1);
	$i = $current;
	$this->Application->InitParser();
	while ($i < $total && $i < ($current + 20)) {
	$a_template = $templates[$i];
	- $this->Application->Parser->CheckTemplate($a_template['module'].'/'.$a_template['path']);
	+
	+ $this->Application->Parser->CheckTemplate($a_template['module'] . '/' . $a_template['path']);
	$i++;
	}

	$this->Application->errorHandlers[0] = $save_handler;

	$this->Application->StoreVar('current_template_to_compile', $i);
	$this->Application->StoreVar('templates_to_compile', serialize($templates));
	$this->Application->StoreVar('compile_errors', serialize($this->Errors));
	$res = floor(($current / $total) * 100);
	if ($res == 100 \|\| $current >= $total) {
	$this->Application->RemoveVar('templates_to_compile');
	$this->Application->RemoveVar('current_template_to_compile');
	$this->Application->Redirect($this->Application->GetVar('finish_template'));
	}
	echo $res;
	}

	function SaveError($errno, $errstr, $errfile, $errline, $errcontext)
	{
	$this->Errors[] = array('msg'=>$errstr, 'file'=>$errfile, 'line'=>$errline);
	return true;
	}

	function FindTemplates()
	{
	- $this->Templates = array();
	- foreach ($this->Application->ModuleInfo as $module=>$options) {
	- $this->FindTemplateFiles('/'.$options['Path'].'admin_templates', $options);
	+ $this->Templates = Array ();
	+
	+ // find admin templates
	+ foreach ($this->Application->ModuleInfo as $module => $options) {
	+ if ($module == 'In-Portal') {
	+ // don't check In-Portal admin templates, because it doesn't have them
	+ continue;
	+ }
	+
	+ $template_path = '/' . $options['Path'] . 'admin_templates';
	+ $options['Path'] = $template_path;
	+
	+ $this->FindTemplateFiles($template_path, $options);
	}
	+
	+ // find Front-End templates
	+ $sql = 'SELECT Name
	+ FROM ' . $this->Application->getUnitOption('theme', 'TableName');
	+ $themes = $this->Conn->GetCol($sql);
	+
	+ $options = Array ();
	+ foreach ($themes as $theme_name) {
	+ $template_path = '/themes/' . $theme_name;
	+ $options['Name'] = 'theme:' . $theme_name;
	+ $options['Path'] = $template_path;
	+
	+ $this->FindTemplateFiles($template_path, $options);
	+ }
	+
	return $this->Templates;
	}

	function FindTemplateFiles($folderPath, $options)
	{
	// if FULL_PATH = "/" ensure, that all "/" in $folderPath are not deleted
	$reg_exp = '/^'.preg_quote(FULL_PATH, '/').'/';
	$folderPath = preg_replace($reg_exp, '', $folderPath, 1); // this make sense, since $folderPath may NOT contain FULL_PATH

	$fh = opendir(FULL_PATH.$folderPath);
	while (($sub_folder = readdir($fh))) {
	$full_path = FULL_PATH.$folderPath.'/'.$sub_folder;
	$base_name = basename($full_path);
	if (is_dir($full_path) && $base_name != '.' && $base_name != '..') {
	$this->FindTemplateFiles($full_path, $options);
	}
	else {
	$info = pathinfo($full_path);
	if (isset($info['extension']) && $info['extension'] == 'tpl') {
	- $this->Templates[] = array('module' => mb_strtolower($options['Name']), 'path' => str_replace(FULL_PATH.'/'.$options['Path'].'admin_templates/', '', preg_replace('/\.tpl$/', '', $full_path)));
	+ $this->Templates[] = array('module' => mb_strtolower($options['Name']), 'path' => str_replace(FULL_PATH . $options['Path'] . '/', '', preg_replace('/\.tpl$/', '', $full_path)));
	}
	}
	}
	}


	}
	\ No newline at end of file

	Property changes on: branches/RC/core/kernel/nparser/compiler.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.1.2.3
	\ No newline at end of property
	+1.1.2.4
	\ No newline at end of property
	Index: branches/RC/core/kernel/nparser/nparser.php
	===================================================================
	--- branches/RC/core/kernel/nparser/nparser.php (revision 11213)
	+++ branches/RC/core/kernel/nparser/nparser.php (revision 11214)
	@@ -1,598 +1,612 @@
	<?php

	include_once(KERNEL_PATH.'/nparser/ntags.php');

	define('TAG_NAMESPACE', 'inp2:');
	define('TAG_NAMESPACE_LENGTH', 5);

	class NParser extends kBase {

	var $Stack = array();
	var $Level = 0;

	var $Buffers = array();
	var $InsideComment = false;

	var $Params = array();
	var $ParamsStack = array();
	var $ParamsLevel = 0;

	var $Definitions = '';

	var $Elements = array(); // holds dynamic elements to function names mapping during execution

	/**
	* Holds location of element definitions inside templates.
	* key - element function name, value - array of 2 keys: {from_pos, to_pos}
	*
	* @var Array
	*/
	var $ElementLocations = Array ();

	var $DataExists = false;

	var $TemplateName = null;
	var $TempalteFullPath = null;

	var $CachePointers = array();
	var $Cachable = array();




	function NParser()
	{
	parent::kBase();
	}

	function Compile($pre_parsed, $template_name = 'unknown')
	{
	$data = file_get_contents($pre_parsed['tname']);

	- $this->CompileRaw($data, $pre_parsed['tname'], $template_name);
	+ if (!$this->CompileRaw($data, $pre_parsed['tname'], $template_name)) {
	+ // compilation failed during errors in template
	+// trigger_error('Template "<strong>' . $template_name . '</strong>" not compiled because of errors', E_USER_WARNING);
	+ return false;
	+ }

	- // saving compiled version
	+ // saving compiled version (only when compilation was successful)
	$compiled = fopen($pre_parsed['fname'], 'w');
	if (!fwrite($compiled, $this->Buffers[0])) {
	trigger_error('Saving compiled template failed', E_USER_ERROR);
	}
	fclose($compiled);
	+
	return true;
	}

	function Parse($raw_template, $name = null)
	{
	$this->CompileRaw($raw_template, $name);
	ob_start();
	$_parser =& $this;
	eval('?'.'>'.$this->Buffers[0]);

	return ob_get_clean();
	}

	function CompileRaw($data, $t_name, $template_name = 'unknown')
	{
	$code = "extract (\$_parser->Params);\n";
	$code .= "\$_parser->ElementLocations['{$template_name}'] = Array('file' => '{$t_name}', 'start_pos' => 0, 'end_pos' => " . strlen($data) . ");\n";

	// $code .= "__@@__DefinitionsMarker__@@__\n";

	// $code .= "if (!\$this->CacheStart('".abs(crc32($t_name))."_0')) {\n";
	$this->Buffers[0] = '<?'."php $code ?>\n";
	$this->Cacheable[0] = true;
	$this->Definitions = '';

	// finding all the tags
	$reg = '(.?)(<[\\/]?)' . TAG_NAMESPACE . '([^>]?)([\\/]?>)(\r\n){0,1}';
	preg_match_all('/'.$reg.'/s', $data, $results, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);

	$this->InsideComment = false;
	foreach ($results as $tag_data) {
	$tag = array(
	'opening' => $tag_data[2][0],
	'tag' => $tag_data[3][0],
	'closing' => $tag_data[4][0],
	'line' => substr_count(substr($data, 0, $tag_data[2][1]), "\n")+1,
	'pos' => $tag_data[2][1],
	'file' => $t_name,
	);

	// the idea is to count number of comment openings and closings before current tag
	// if the numbers do not match we inverse the status of InsideComment
	if (substr_count($tag_data[1][0], '<!--') != substr_count($tag_data[1][0], '-->')) {
	$this->InsideComment = !$this->InsideComment;
	}

	// appending any text/html data found before tag
	$this->Buffers[$this->Level] .= $tag_data[1][0];
	if (!$this->InsideComment) {
	$tmp_tag = $this->Application->CurrentNTag;
	$this->Application->CurrentNTag = $tag;
	if ($this->ProcessTag($tag) === false) {
	$this->Application->CurrentNTag = $tmp_tag;
	return false;
	}
	$this->Application->CurrentNTag = $tmp_tag;
	}
	else {
	$this->Buffers[$this->Level] .= $tag_data[2][0].$tag_data[3][0].$tag_data[4][0];
	}
	}

	if ($this->Level > 0) {
	$this->Application->handleError(E_USER_ERROR, 'Unclosed tag opened by '.$this->TagInfo($this->Stack[$this->Level]->Tag), $this->Stack[$this->Level]->Tag['file'], $this->Stack[$this->Level]->Tag['line']);
	return false;
	}

	// appending text data after last tag (after its closing pos),
	// if no tag was found at all ($tag_data is not set) - append the whole $data
	$this->Buffers[$this->Level] .= isset($tag_data) ? substr($data, $tag_data[4][1]+strlen($tag_data[4][0])) : $data;
	$this->Buffers[$this->Level] = preg_replace('/<!--##(.*?)##-->/s', '', $this->Buffers[$this->Level]); // remove hidden comments IB#23065
	// $this->Buffers[$this->Level] .= '<?'.'php '."\n\$_parser->CacheEnd();\n}\n"." ?".">\n";
	// $this->Buffers[$this->Level] = str_replace('__@@__DefinitionsMarker__@@__', $this->Definitions, $this->Buffers[$this->Level]);
	+
	+ return true;
	}

	function SplitParamsStr($params_str)
	{
	preg_match_all('/([\${}a-zA-Z0-9_.\\-\\\\#\\[\\]]+)=(["\']{1,1})(.*?)(?<!\\\)\\2/s', $params_str, $rets, PREG_SET_ORDER);

	$values = Array();

	// we need to replace all occurences of any current param $key with {$key} for correct variable substitution
	foreach ($rets AS $key => $val){
	$values[$val[1]] = str_replace('\\' . $val[2], $val[2], $val[3]);
	}
	+
	return $values;
	}

	function SplitTag($tag)
	{
	if (!preg_match('/([^_ \t\n])[_]?([^ \t\n])[ \t\n](.)$$/s', $tag['tag'], $parts)) {
	// this is virtually impossible, but just in case
	$this->Application->handleError(E_USER_ERROR, 'Incorrect tag format: '.$tag['tag'], $tag['file'], $tag['line']);
	return false;
	}

	$splited['prefix'] = $parts[2] ? $parts[1] : '__auto__';
	$splited['name'] = $parts[2] ? $parts[2] : $parts[1];
	$splited['attrs'] = $parts[3];
	+
	return $splited;
	}

	function ProcessTag($tag)
	{
	$splited = $this->SplitTag($tag);
	- if ($splited === false) return false;
	+ if ($splited === false) {
	+ return false;
	+ }
	+
	$tag = array_merge($tag, $splited);
	$tag['processed'] = false;
	$tag['NP'] = $this->SplitParamsStr($tag['attrs']);

	$o = '';
	$tag['is_closing'] = $tag['opening'] == '</' \|\| $tag['closing'] == '/>';
	if (class_exists('_Tag_'.$tag['name'])) { // block tags should have special handling class
	if ($tag['opening'] == '<') {
	$class = '_Tag_'.$tag['name'];
	$instance = new $class($tag);
	$instance->Parser =& $this;
	/* @var $instance _BlockTag */
	$this->Stack[++$this->Level] =& $instance;
	$this->Buffers[$this->Level] = '';
	$this->Cachable[$this->Level] = true;
	$open_code = $instance->Open($tag);
	- if ($open_code === false) return false;
	+ if ($open_code === false) {
	+ return false;
	+ }
	$o .= $open_code;
	}

	if ($tag['is_closing']) { // not ELSE here, because tag may be <empty/> and still has a handler-class
	if ($this->Level == 0) {
	$dump = array();
	foreach ($this->Stack as $instance) {
	$dump[] = $instance->Tag;
	}
	print_pre($dump);
	$this->Application->handleError(E_USER_ERROR, 'Closing tag without an opening: '.$this->TagInfo($tag).' <b> - probably opening tag was removed or nested tags error</b>', $tag['file'], $tag['line']);
	return false;
	}
	if ($this->Stack[$this->Level]->Tag['name'] != $tag['name']) {
	$opening_tag = $this->Stack[$this->Level]->Tag;
	$this->Application->handleError(E_USER_ERROR,
	'Closing tag '.$this->TagInfo($tag).' does not match
	opening tag at current nesting level ('.$this->TagInfo($opening_tag).'
	opened at line '.$opening_tag['line'].')', $tag['file'], $tag['line']);
	return false;
	}

	$o .= $this->Stack[$this->Level]->Close($tag); // DO NOT use $this->Level-- here because it's used inside Close
	$this->Level--;
	}
	}
	else { // regular tags - just compile
	if (!$tag['is_closing']) {
	$this->Application->handleError(E_USER_ERROR, 'Tag without a handler: '.$this->TagInfo($tag).' <b> - probably missing <empty <span style="color: red">/</span>> tag closing</b>', $tag['file'], $tag['line']);
	return false;
	}

	if ($this->Level > 0) $o .= $this->Stack[$this->Level]->PassThrough($tag);
	if (!$tag['processed']) {
	$compiled = $this->CompileTag($tag);
	if ($compiled === false) return false;
	if (isset($tag['NP']['cachable']) && (!$tag['NP']['cachable'] \|\| $tag['NP']['cachable'] == 'false')) {
	$this->Cachable[$this->Level] = false;
	}
	$o .= '<?'.'php ' . $compiled . " ?>\n";
	// $o .= '<?'.'php ';
	// $o .= (isset($tag['NP']['cachable']) && (!$tag['NP']['cachable'] \|\| $tag['NP']['cachable'] == 'false')) ? $this->BreakCache($compiled, $this->GetPointer($tag)) : $compiled;
	// $o .= " ?".">\n";
	}
	}
	$this->Buffers[$this->Level] .= $o;
	return true;
	}

	function GetPointer($tag)
	{
	return abs(crc32($tag['file'])).'_'.$tag['line'];
	}

	function BreakCache($code, $pointer, $condition='')
	{
	return "\$_parser->CacheEnd();\n}\n" . $code."\nif ( !\$_parser->CacheStart('{$pointer}'" . ($condition ? ", {$condition}" : '') . ") ) {\n";
	}

	function TagInfo($tag, $with_params=false)
	{
	return "<b>{$tag['prefix']}_{$tag['name']}".($with_params ? ' '.$tag['attrs'] : '')."</b>";
	}

	function CompileParamsArray($arr)
	{
	$to_pass = 'Array(';
	foreach ($arr as $name => $val) {
	$to_pass .= '"'.$name.'" => "'.str_replace('"', '\"', $val).'",';
	}
	$to_pass .= ')';
	return $to_pass;
	}

	function CompileTag($tag)
	{
	$to_pass = $this->CompileParamsArray($tag['NP']);

	$code = '';
	if ($tag['prefix'] == '__auto__') {
	$prefix = $this->GetParam('PrefixSpecial');
	$code .= '$_p_ =& $_parser->GetProcessor($PrefixSpecial);'."\n";
	$code .= 'echo $_p_->ProcessParsedTag(\''.$tag['name'].'\', '.$to_pass.', "$PrefixSpecial", \''.$tag['file'].'\', '.$tag['line'].');'."\n";
	}
	else {
	$prefix = $tag['prefix'];
	$code .= '$_p_ =& $_parser->GetProcessor("'.$tag['prefix'].'");'."\n";
	$code .= 'echo $_p_->ProcessParsedTag(\''.$tag['name'].'\', '.$to_pass.', "'.$tag['prefix'].'", \''.$tag['file'].'\', '.$tag['line'].');'."\n";
	}
	if (isset($tag['NP']['result_to_var'])) {
	$code .= "\$params['{$tag['NP']['result_to_var']}'] = \$_parser->GetParam('{$tag['NP']['result_to_var']}');\n";
	$code .= "\${$tag['NP']['result_to_var']} = \$params['{$tag['NP']['result_to_var']}'];\n";
	}
	if ($prefix && strpos($prefix, '$') === false) {
	$p =& $this->GetProcessor($prefix);
	if (!is_object($p) \|\| !$p->CheckTag($tag['name'], $tag['prefix'])) {
	$this->Application->handleError(E_USER_ERROR, 'Unknown tag: '.$this->TagInfo($tag).' <b> - incorrect tag name or prefix </b>', $tag['file'], $tag['line']);
	return false;
	}
	}
	return $code;
	}

	function CheckTemplate($t, $silent=null)
	{
	$pre_parsed = $this->Application->TemplatesCache->GetPreParsed($t);
	if (!$pre_parsed) {
	if (!$silent) {
	if ($this->Application->isDebugMode()) $this->Application->Debugger->appendTrace();
	trigger_error('Cannot include "<strong>' . $t . '</strong>" - file does not exist', E_USER_ERROR);
	}
	return false;
	}
	if (!$pre_parsed \|\| !$pre_parsed['active'] \|\| defined('DBG_NPARSER_FORCE_COMPILE') && DBG_NPARSER_FORCE_COMPILE) {
	$inc_parser = new NParser();
	if (!$inc_parser->Compile($pre_parsed, $t)) return false;
	}
	return $pre_parsed;
	}

	function Run($t, $silent=null)
	{
	$pre_parsed = $this->CheckTemplate($t, $silent);
	if (!$pre_parsed) return false;
	$backup_template = $this->TemplateName;
	$backup_fullpath = $this->TempalteFullPath;
	$this->TemplateName = $t;
	$this->TempalteFullPath = $pre_parsed['tname'];

	ob_start();
	$_parser =& $this;
	if ($pre_parsed['mode'] == 'file') {
	include($pre_parsed['fname']);
	}
	else {
	eval('?'.'>'.$pre_parsed['content']);
	}
	$output = ob_get_contents();
	ob_end_clean();

	$this->TemplateName = $backup_template;
	$this->TempalteFullPath = $backup_fullpath;

	return $output;
	}

	function &GetProcessor($prefix)
	{
	static $Processors = array();
	if (!isset($Processors[$prefix])) {
	$Processors[$prefix] = $this->Application->recallObject($prefix.'_TagProcessor');
	}

	return $Processors[$prefix];
	}

	function SelectParam($params, $possible_names)
	{
	if (!is_array($params)) return;
	if (!is_array($possible_names))

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

	function SetParams($params)
	{
	$this->Params = $params;
	$keys = array_keys($this->Params);
	}

	function GetParam($name)
	{
	return isset($this->Params[$name]) ? $this->Params[$name] : false;
	}

	function SetParam($name, $value)
	{
	$this->Params[$name] = $value;
	}

	function PushParams($params)
	{
	$this->ParamsStack[$this->ParamsLevel++] = $this->Params;
	$this->Params = $params;
	}

	function PopParams()
	{
	$this->Params = $this->ParamsStack[--$this->ParamsLevel];
	}

	function ParseBlock($params, $pass_params=false)
	{
	if (isset($params['cache_timeout']) && ($ret = $this->CacheGet($this->FormCacheKey('element_'.$params['name'])))) {
	return $ret;
	}

	if (!array_key_exists($params['name'], $this->Elements) && array_key_exists('default_element', $params)) {
	// when given element not found, but default element name given, then render it instead
	$params['name'] = $params['default_element'];
	unset($params['default_element']);
	return $this->ParseBlock($params, $pass_params);
	}

	$original_params = $params;

	if ($pass_params \|\| isset($params['pass_params'])) $params = array_merge($this->Params, $params);
	$this->PushParams($params);
	$data_exists_bak = $this->DataExists;

	// if we are parsing design block and we have block_no_data - we need to wrap block_no_data into design,
	// so we should set DataExists to true manually, otherwise the design block will be skipped because of data_exists in params
	//
	// keep_data_exists is used by block RenderElement (always added in ntags.php), to keep the DataExists value
	// from inside-content block, otherwise when parsing the design block DataExists will be reset to false resulting missing design block
	$this->DataExists = isset($params['keep_data_exists']) && $this->DataExists \|\| (isset($params['design']) && isset($params['block_no_data']) && $params['name'] == $params['design']);

	if (!array_key_exists($params['name'], $this->Elements)) {
	$pre_parsed = $this->Application->TemplatesCache->GetPreParsed($params['name']);
	if ($pre_parsed) {
	$ret = $this->IncludeTemplate($params);

	if (array_key_exists('no_editing', $params) && $params['no_editing']) {
	// when individual render element don't want to be edited
	return $ret;
	}

	return defined('DBG_DECORATE_BLOCKS') && DBG_DECORATE_BLOCKS ? $this->DecorateBlock($ret, $params, true) : $ret;
	}

	if ($this->Application->isDebugMode()) {
	$this->Application->Debugger->appendTrace();
	}
	$trace_results = debug_backtrace();
	$this->Application->handleError(E_USER_ERROR, '<b>Rendering of undefined element '.$params['name'].'</b>', $trace_results[0]['file'], $trace_results[0]['line']);
	}

	$m_processor =& $this->GetProcessor('m');
	$flag_values = $m_processor->PreparePostProcess($params);

	$f_name = $this->Elements[$params['name']];
	$ret = $f_name($this, $params);
	$ret = $m_processor->PostProcess($ret, $flag_values);
	$this->PopParams();

	$this->CheckNoData($ret, $params);

	$this->DataExists = $data_exists_bak \|\| $this->DataExists;

	if (isset($original_params['cache_timeout'])) {
	$this->CacheSet($this->FormCacheKey('element_'.$original_params['name']), $ret, $original_params['cache_timeout']);
	}

	if (array_key_exists('no_editing', $params) && $params['no_editing']) {
	// when individual render element don't want to be edited
	return $ret;
	}

	return defined('DBG_DECORATE_BLOCKS') && DBG_DECORATE_BLOCKS ? $this->DecorateBlock($ret, $params) : $ret;
	}

	function DecorateBlock($block_content, $block_params, $is_template = false)
	{
	static $used_ids = Array ();

	$block_name = $block_params['name'];
	$function_name = $is_template ? $block_name : $this->Elements[$block_name];
	$element_location = $this->ElementLocations[$function_name];

	// ensure unique id for every div (used from print lists)
	$container_num = 1;
	$container_id = 'parser_block[' . $function_name . ']';
	while (in_array($container_id . '_' . $container_num, $used_ids)) {
	$container_num++;
	}

	$container_id .= '_' . $container_num;
	$used_ids[] = $container_id;

	// prepare parameter string
	$param_string = "$block_name:$function_name:{$element_location['file']}:{$element_location['start_pos']}:{$element_location['end_pos']}";
	$block_editor = '<div id="' . $container_id . '" params="' . $param_string . '" class="block-container">
	<span class="edit-block" id="' . $container_id . '_btn">edit</span><br />
	%s
	</div>';

	// 1 - text before, 2 - open tag, 3 - open tag attributes, 4 - content inside tag, 5 - closing tag, 6 - text after closing tag
	if (preg_match('/^(\s)<(td\|span)(.?)>(.)<\/(td\|span)>(.)$/is', $block_content, $regs)) {
	// div inside span -> put div outside span
	return $regs[1] . '<' . $regs[2] . ' ' . $regs[3] . '>' . str_replace('%s', $regs[4], $block_editor) . '</' . $regs[5] . '>' . $regs[6];
	}

	return str_replace('%s', $block_content, $block_editor);
	}

	function IncludeTemplate($params, $silent=null)
	{
	$t = is_array($params) ? $this->SelectParam($params, 't,template,block,name') : $params;

	if (isset($params['cache_timeout']) && ($ret = $this->CacheGet('template:'.$t))) {
	return $ret;
	}

	$t = eregi_replace("\.tpl$", '', $t);
	$data_exists_bak = $this->DataExists;
	$this->DataExists = false;

	if (!isset($silent) && array_key_exists('is_silent', $params)) {
	$silent = $params['is_silent'];
	}

	$this->PushParams($params);
	$ret = $this->Run($t, $silent);
	$this->PopParams();

	$this->CheckNoData($ret, $params);
	$this->DataExists = $data_exists_bak \|\| $this->DataExists;

	if (isset($params['cache_timeout'])) {
	$this->CacheSet('template:'.$t, $ret, $params['cache_timeout']);
	}

	return $ret;
	}

	function CheckNoData(&$ret, $params)
	{
	if (isset($params['data_exists']) && !$this->DataExists) {
	$block_no_data = isset($params['BlockNoData']) ? $params['BlockNoData'] : (isset($params['block_no_data']) ? $params['block_no_data'] : false);
	if ($block_no_data) {
	$ret = $this->ParseBlock(array('name'=>$block_no_data));
	}
	else {
	$ret = '';
	}
	}
	}

	function CacheGet($name)
	{
	if (!$this->Application->ConfigValue('SystemTagCache')) return false;
	return $this->Application->CacheGet($name);
	}

	function CacheSet($name, $value, $expiration=0)
	{
	if (!$this->Application->ConfigValue('SystemTagCache')) return false;
	return $this->Application->CacheSet($name, $value, $expiration);
	}

	function FormCacheKey($element, $file=null, $add_prefixes=null)
	{
	if (!isset($file)) {
	$file = str_replace(FULL_PATH, '', $this->TempalteFullPath).':'.$this->Application->GetVar('t');
	}
	$parts = array(
	'file_'.$file.'('.filemtime($this->TempalteFullPath).')' => 'serials:file_ts', // theme + template timestamp
	'm_lang_'.$this->Application->GetVar('m_lang') => 'serials:lang_ts',
	'm_cat_id_'.$this->Application->GetVar('m_cat_id') => 'serials:cat_'.$this->Application->GetVar('m_cat_id').'_ts',
	'm_cat_page'.$this->Application->GetVar('m_cat_page') => false,
	);
	if (isset($add_prefixes)) {
	foreach ($add_prefixes as $prefix) {
	$parts[$prefix.'_id_'.$this->Application->GetVar("{$prefix}_id")] = "serials:$prefix_".$this->Application->GetVar("{$prefix}_id").'_ts';
	$parts[$prefix.'_page_'.$this->Application->GetVar("{$prefix}_Page")] = false;
	}
	}
	$key = '';
	foreach ($parts as $part => $ts_name) {
	if ($ts_name) {
	$ts = $this->Application->CacheGet($ts_name);
	$key .= "$part($ts):";
	}
	else {
	$key .= "$part:";
	}
	}
	$key .= $element;

	return crc32($key);
	}

	function PushPointer($pointer)
	{
	$this->CachePointers[++$this->CacheLevel] = $this->FormCacheKey('pointer:'.$pointer);
	return $this->CachePointers[$this->CacheLevel];
	}

	function PopPointer()
	{
	return $this->CachePointers[$this->CacheLevel--];
	}

	function CacheStart($pointer=null)
	{
	if ($ret = $this->CacheGet($this->PushPointer($pointer)) ) {
	echo $ret;
	$this->PopPointer();
	return true;
	}
	ob_start();
	return false;
	}

	function CacheEnd($elem=null)
	{
	$ret = ob_get_clean();
	$this->CacheSet($this->PopPointer(), $ret); // . ($this->CurrentKeyPart ? ':'.$this->CurrentKeyPart : '')
	echo $ret;
	}
	}
	\ No newline at end of file

	Property changes on: branches/RC/core/kernel/nparser/nparser.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.1.2.12
	\ No newline at end of property
	+1.1.2.13
	\ No newline at end of property
	Index: branches/RC/core/kernel/nparser/ntags.php
	===================================================================
	--- branches/RC/core/kernel/nparser/ntags.php (revision 11213)
	+++ branches/RC/core/kernel/nparser/ntags.php (revision 11214)
	@@ -1,471 +1,487 @@
	<?php

	class _BlockTag extends kBase {

	/**
	* Enter description here...
	*
	* @var NParser
	*/
	var $Parser = null;
	var $Tag = null;

	/**
	* Contains parameter names, that should be given to tag in any case
	*
	* @var Array
	*/
	var $_requiredParams = Array ();

	function _BlockTag($tag)
	{
	parent::kBase();
	$this->Tag = $tag;
	}

	function Open($tag)
	{
	if (!$this->_checkRequiredParams($tag)) {
	return false;
	}

	return '';
	}

	/**
	* Checks, that all required attributes for tag are passed
	*
	* @param Array $tag
	* @return bool
	*/
	function _checkRequiredParams($tag)
	{
	$missing_params = array_diff($this->_requiredParams, array_keys($tag['NP']));
	if (!$missing_params) {
	return true;
	}

	$error_msg = 'Tag ' . $this->Parser->TagInfo($tag, true) . ' called <b> without required ' . implode(', ', $missing_params) . ' </b> attribute';
	if (count($missing_params) > 1) {
	$error_msg .= '(-s)';
	}

	$this->Application->handleError(E_USER_ERROR, $error_msg, $tag['file'], $tag['line']);
	return false;
	}

	/**
	* All tags inside block tag are passed through to this method
	* Any returned result is appened to current level's buffer
	* This can be used to implement special handling of such tags as <inp2:m_else/>
	*
	* @param unknown_type $tag
	* @return unknown
	*/
	function PassThrough(&$tag)
	{
	return '';
	}

	function Close($tag)
	{
	return $this->Parser->Buffers[$this->Parser->Level];
	}

	function AppendCode(&$o, $code, $php_tags=true)
	{
	if ($php_tags) {
	$o .= '<?'."php\n" . ( is_array($code) ? "\t".implode("\n\t", $code)."\n" : $code) .'?>';
	}
	else {
	$o .= ( is_array($code) ? "\t".implode("\n\t", $code)."\n" : $code);
	}
	}
	}

	class _Tag_Comment extends _BlockTag {

	function PassThrough(&$tag)
	{
	$tag['processed'] = true;
	}

	function Close($tag)
	{
	return '';
	}
	}

	class _Tag_DefineElement extends _BlockTag {
	/*var $ElemName;

	function Open($tag)
	{
	$o = '';

	$pointer = abs(crc32($tag['file'])).'_'.$tag['line'];
	$f_name = $tag['NP']['name'].'_'.$pointer;
	$this->ElemName = $tag['NP']['name'];

	$code[] = "\$_parser->Elements['{$tag['NP']['name']}'] = '$f_name';";

	// function_exists is required here, because a template may be included more than once
	// leading to Cannot redeclare error
	$code[] = "if (!function_exists('{$f_name}')) {";
	$code[] = "function $f_name(&\$_parser, \$params) {";
	$code[] = "global \$application;";
	$code[] = "if (!\$_output = \$_parser->CacheStart('{$pointer}')) {";

	$defaults = $this->Parser->CompileParamsArray($tag['NP']);

	$code[] = "\$params = array_merge($defaults, \$params);";
	$code[] = "if (!isset(\$params['PrefixSpecial']) && isset(\$params['prefix'])) {\$params['PrefixSpecial'] = \$params['prefix'];};";
	$code[] = "extract(\$params);";
	$code[] = "\$_parser->SetParams(\$params);";
	$code[] = 'ob_start();';
	$this->AppendCode($o, $code, false);
	return $o . '?'.'>';
	}

	function Close($tag)
	{
	$o = $this->Parser->Buffers[$this->Parser->Level];
	$code[] = "\$_parser->CacheEnd();\n";
	$code[] = '$_output = ob_get_contents();';
	$code[] = 'ob_end_clean();';
	$code[] = '}';
	$code[] = "return \$_output === true ? '' : \$_output;";
	$code[] = '}}';

	$code[] = "\$_parser->CachableElements['".$this->ElemName."'] = ".($this->Parser->Cachable[$this->Parser->Level] ? 'true':'false').';';

	$o .= '<?'.'php';
	$this->AppendCode($o, $code, false);

	return $o;
	// $this->Parser->Definitions .= $o."\n";
	// return '';
	} */

	function _Tag_DefineElement($tag)
	{
	parent::_BlockTag($tag);

	$this->_requiredParams = Array ('name');
	}

	function Open($tag)
	{
	$o = parent::Open($tag);

	+ if ($o === false) {
	+ // some required params not passed
	+ return $o;
	+ }
	+
	$f_name = $tag['NP']['name'].'_'.abs(crc32($tag['file'])).'_'.$tag['line'];
	$this->Tag['function_name'] = $f_name; // for later use in closing tag

	$code[] = "\$_parser->Elements['{$tag['NP']['name']}'] = '$f_name';";

	// function_exists is required here, because a template may be included more than once
	// leading to Cannot redeclare error
	$code[] = "if (!function_exists('{$f_name}')) {";
	$code[] = "function $f_name(&\$_parser, \$params) {";
	$code[] = "global \$application;";

	$tag['NP'] = $this->_extractParams($tag['NP']);
	$defaults = $this->Parser->CompileParamsArray($tag['NP']);

	$code[] = "\$params = array_merge($defaults, \$params);";
	$code[] = "if (!isset(\$params['PrefixSpecial']) && isset(\$params['prefix'])) {\$params['PrefixSpecial'] = \$params['prefix'];};";
	$code[] = "extract(\$params);";
	$code[] = "\$_parser->SetParams(\$params);";
	$code[] = 'ob_start();';
	$this->AppendCode($o, $code);
	return $o;
	}

	/**
	* Converts $param_name to $params['param_name']
	*
	* @param Array $params
	* @return Array
	*/
	function _extractParams($params)
	{
	foreach ($params as $param_name => $param_value) {
	$params[$param_name] = preg_replace('/[\{]{0,1}([\$])(.?[^\$\s\{\}])[\}]{0,1}/', '{$params[\'\\2\']}', $param_value);
	}

	return $params;
	}

	function Close($tag)
	{
	$o = $this->Parser->Buffers[$this->Parser->Level];
	$code[] = '$_output = ob_get_contents();';
	$code[] = 'ob_end_clean();';
	$code[] = 'return $_output;';
	$code[] = '}}';

	$end_pos = $this->Tag['pos'] + $tag['pos'] + strlen($tag['opening']) + strlen($tag['tag']) + strlen($tag['closing']) + TAG_NAMESPACE_LENGTH;
	$code[] = "\$_parser->ElementLocations['{$this->Tag['function_name']}'] = Array('file' => '{$this->Tag['file']}', 'start_pos' => {$this->Tag['pos']}, 'end_pos' => {$end_pos});";

	$this->AppendCode($o, $code);
	return $o;
	}
	}

	class _Tag_Capture extends _Tag_DefineElement {

	function _Tag_Capture($tag)
	{
	parent::_Tag_DefineElement($tag);

	$this->_requiredParams = Array ('to_var');
	}

	function Open($tag)
	{
	if (!$this->_checkRequiredParams($tag)) {
	return false;
	}

	$tag['NP']['name'] = '__capture_'.$tag['NP']['to_var'];

	$o = '';
	// $this->AppendCode($o, "\$_parser->Captures['{$tag['NP']['to_var']}'] = 1;", false);
	$this->AppendCode($o, "\$_parser->Captures['{$tag['NP']['to_var']}'] = 1;");
	$o .= parent::Open($tag);
	return $o;
	}
	}

	class _Tag_RenderElement extends _Tag_DefineElement {
	var $Single = true;
	var $OriginalTag;

	function _Tag_RenderElement($tag)
	{
	parent::_Tag_DefineElement($tag);

	if (!$tag['is_closing']) {
	$this->_requiredParams = Array ('design');
	}
	}

	function Open($tag)
	{
	if (!$this->_checkRequiredParams($tag)) {
	return false;
	}

	$o = '';
	if ($tag['is_closing']) {
	if (isset($tag['NP']['design'])) {
	$this->RenderDesignCode($o, $tag['NP']);
	return $o;
	}
	$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
	/* $pointer = abs(crc32($tag['file'])).'_'.$tag['line'];
	// $code[] = "}";
	// $code[] = "if (!\$_parser->CachableElements['".$tag['NP']['name']."']) {";
	// $code[] = "\$_parser->CacheEndInside();";
	// $code[] = "}";
	$o .= '<?'.'php ';

	$this->AppendCode($o, $this->Parser->BreakCache('', $pointer.'a', "\$_parser->CachableElements['".$tag['NP']['name']."']"), false);
	$this->AppendCode($o, "echo (\$_parser->ParseBlock($to_pass));\n", false);
	$this->AppendCode($o, $this->Parser->BreakCache('', $pointer.'b') . " ?".">\n", false);
	// $this->AppendCode($o, "if (!\$_parser->CacheStartOrContinue(\$_parser->CachableElements['".$tag['NP']['name']."'], '{$pointer}')) {".' ?'.'>', false);
	*/
	$this->AppendCode($o, "echo (\$_parser->ParseBlock($to_pass));");
	return $o;
	}
	$this->Single = false;
	$this->OriginalTag = $tag;
	$tag['NP']['name'] = '__lambda';

	return parent::Open($tag);
	}

	function RenderDesignCode(&$o, $params)
	{
	$to_pass = $this->Parser->CompileParamsArray($params);
	$code[] = "echo (\$_parser->ParseBlock(array_merge($to_pass, array('name'=>\"{$params['design']}\",'content'=>\$_parser->ParseBlock($to_pass), 'keep_data_exists'=>1))));";
	$this->AppendCode($o, $code);
	}

	function Close($tag)
	{
	if ($this->Single) {
	return $this->Parser->Buffers[$this->Parser->Level];
	}
	$o = parent::Close($tag);
	$this->OriginalTag['NP']['name'] = '__lambda';

	$this->RenderDesignCode($o, $this->OriginalTag['NP']);
	return $o;
	}
	}

	class _Tag_Param extends _BlockTag {

	function _Tag_Param($tag)
	{
	parent::_BlockTag($tag);

	$this->_requiredParams = Array ('name');
	}

	function Open($tag)
	{
	$o = parent::Open($tag);

	+ if ($o === false) {
	+ // some required params not passed
	+ return $o;
	+ }
	+
	$capture_params = $tag['NP'];
	$capture_params['name'] = '__capture_' . $tag['NP']['name'];

	$capture_to_pass = $this->Parser->CompileParamsArray($capture_params);
	$code[] = "if (isset(\$_parser->Captures['{$tag['NP']['name']}'])) {";
	$code[] = "\${$tag['NP']['name']} = \$_parser->ParseBlock($capture_to_pass);";
	$code[] = "}";
	$code[] = "else {";
	$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
	$code[] = '$_p_ =& $_parser->GetProcessor(\'m\');';
	$code[] = '$_tag_params = ' . $to_pass . ';';
	$code[] = "\${$tag['NP']['name']} = \$_p_->PostProcess(\${$tag['NP']['name']}, \$_p_->PreparePostProcess(\$_tag_params));";
	$code[] = "}";

	if (array_key_exists('plus', $tag['NP'])) {
	$code[] = "\${$tag['NP']['name']} += {$tag['NP']['plus']};";
	}

	$code[] = "\$params['{$tag['NP']['name']}'] = \${$tag['NP']['name']};";
	$code[] = "echo (\${$tag['NP']['name']});";

	$this->AppendCode($o, $code);
	return $o;
	}
	}

	class _Tag_Include extends _BlockTag {

	function Open($tag)
	{
	$o = '';
	$to_pass = $this->Parser->CompileParamsArray($tag['NP']);
	$this->AppendCode($o, "echo (\$_parser->IncludeTemplate($to_pass))");
	return $o;
	}
	}

	class _Tag_If extends _BlockTag {

	/**
	* Permanently inverses if tag (used in ifnot tag)
	*
	* @var bool
	*/
	var $_Inversed = false;

	function _Tag_If($tag)
	{
	parent::_BlockTag($tag);

	$this->_requiredParams = Array ('check');
	}

	function Open($tag)
	{
	$o = parent::Open($tag);
	+
	+ if ($o === false) {
	+ // some required params not passed
	+ return $o;
	+ }
	+
	$to_pass = $this->Parser->CompileParamsArray($tag['NP']);

	$code[] = "\$_splited = \$_parser->SplitTag(array('tag'=>\"{$tag['NP']['check']}\", 'file'=>'{$tag['file']}', 'line'=>{$tag['line']}));";
	$code[] = 'if ($_splited[\'prefix\'] == \'__auto__\') {$_splited[\'prefix\'] = $PrefixSpecial;}';
	$code[] = '$_p_ =& $_parser->GetProcessor($_splited[\'prefix\']);';
	if (isset($tag['NP']['inverse']) \|\| $this->_Inversed) {
	$code[] = "if (!\$_p_->ProcessParsedTag(\$_splited['name'], $to_pass, \$_splited['prefix'], '{$tag['file']}', {$tag['line']})) {";
	}
	else {
	$code[] = "if (\$_p_->ProcessParsedTag(\$_splited['name'], $to_pass, \$_splited['prefix'], '{$tag['file']}', {$tag['line']})) {";
	}
	$this->AppendCode($o, $code);
	return $o;
	}

	function PassThrough(&$tag)
	{
	$o = '';
	if ($tag['name'] == 'else') {
	$this->AppendCode($o, '} else {');
	$tag['processed'] = true;
	}
	if ($tag['name'] == 'elseif') {
	if (!$this->_checkRequiredParams($tag)) {
	return '';
	}

	$to_pass = $this->Parser->CompileParamsArray($tag['NP']);

	$code[] = "\$_splited = \$_parser->SplitTag(array('tag'=>\"{$tag['NP']['check']}\", 'file'=>'{$tag['file']}', 'line'=>{$tag['line']}));";
	$code[] = 'if ($_splited[\'prefix\'] == \'__auto__\') {$_splited[\'prefix\'] = $PrefixSpecial;}';
	$code[] = '$_p_ =& $_parser->GetProcessor($_splited[\'prefix\']);';
	if (isset($tag['NP']['inverse']) \|\| $this->_Inversed) {
	$code[] = "} else if (!\$_p_->ProcessParsedTag(\$_splited['name'], $to_pass, \$_splited['prefix'], '{$tag['file']}', {$tag['line']})) {";
	}
	else {
	$code[] = "} else if (\$_p_->ProcessParsedTag(\$_splited['name'], $to_pass, \$_splited['prefix'], '{$tag['file']}', {$tag['line']})) {";
	}
	$this->AppendCode($o, $code);

	$tag['processed'] = true;
	}
	return $o;
	}

	function Close($tag)
	{
	$o = $this->Parser->Buffers[$this->Parser->Level];
	$this->AppendCode($o, "}\n");
	return $o;
	}
	}

	class _Tag_IfNot extends _Tag_If {

	function _Tag_IfNot($tag)
	{
	parent::_Tag_If($tag);
	$this->_Inversed = true;
	}

	}

	class _Tag_DefaultParam extends _BlockTag {

	function Open($tag)
	{
	$o = '';
	foreach ($tag['NP'] as $key => $val) {
	$code[] = 'if (!isset($'.$key.')) $params[\''.$key.'\'] = \''.$val.'\';';
	$code[] = '$'.$key.' = isset($'.$key.') ? $'.$key.' : \''.$val.'\';';
	}
	$this->AppendCode($o, $code);
	return $o;
	}
	}

	class _Tag_Cache extends _BlockTag {

	function Open($tag)
	{
	$pointer = abs(crc32($tag['file'])).'_'.$tag['line'];
	$o = '';
	$this->AppendCode($o, "if (!\$_parser->CacheStart('{$pointer}')) {\n");
	return $o;
	}

	function Close($tag)
	{
	$o = $this->Parser->Buffers[$this->Parser->Level];
	$this->AppendCode($o, "\$_parser->CacheEnd();\n}\n");
	return $o;
	}

	}

	Property changes on: branches/RC/core/kernel/nparser/ntags.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.1.2.7
	\ No newline at end of property
	+1.1.2.8
	\ No newline at end of property
	Index: branches/RC/core/kernel/parser/template.php
	===================================================================
	--- branches/RC/core/kernel/parser/template.php (revision 11213)
	+++ branches/RC/core/kernel/parser/template.php (revision 11214)
	@@ -1,267 +1,271 @@
	<?php

	class Template {
	var $Body = '';
	var $BasePath = '';
	var $Filename = '';

	function Template($base_path=null, $filename=null, $silent=0)
	{
	if ($this->SetBasePath($base_path)) {
	if (isset($filename)) {
	$this->Filename = $filename;
	$this->LoadTemplate($silent);
	}
	}
	}

	function SetBasePath($base_path=null)
	{
	if (isset($base_path)) {
	$base_path = eregi_replace("/$", '', $base_path); //Cutting possible last slash
	$this->BasePath = $base_path;
	return true;
	}
	return false;
	}

	function GetFullPath()
	{
	return $this->BasePath.'/'.ltrim($this->Filename, '/').'.tpl';
	}

	/**
	* Enter description here...
	*
	* @param int $silent template not found {0 - fatal error, 1 - warning, 2 - nothing}
	* @return bool
	*/
	function LoadTemplate($silent = 0)
	{
	$filename = $this->GetFullPath();
	if (file_exists($filename)) {
	if (filesize ($filename) == 0) {
	trigger_error("Template file size is 0: <b>$filename</b>", ($silent ? E_USER_NOTICE : E_USER_ERROR) );
	}

	// stripping out special comments
	$this->SetBody(preg_replace('/<!--##.*##-->/sU', '', file_get_contents($filename)));
	/*$handle = fopen ($filename, "r");
	$contents = fread ($handle, filesize ($filename));
	$this->SetBody($contents);
	fclose ($handle);*/
	return true;
	}
	else {
	if (($silent != 2) && !$silent) {
	$application =& kApplication::Instance();
	if ($application->isDebugMode()) {
	$application->Debugger->appendTrace();
	}
	trigger_error('File or block not found: <b>'.$filename.'</b> at '.$application->Parser->TemplateName, E_USER_ERROR);
	}
	return false;
	}
	}

	function SetBody($body)
	{
	$this->Body = $body;
	}

	function GetBody()
	{
	return $this->Body;
	}
	}

	class TemplatesCache extends kBase {
	var $Templates = Array();
	var $BasePath;
	var $FileNames = Array();

	function TemplatesCache()
	{
	parent::kBase();
	$this->BasePath = FULL_PATH.THEMES_PATH;

	$conn =& $this->Application->GetADODBConnection();
	}

	/**
	* Based on template name gets it's location on disk and owner module
	*
	* @param string $filename
	* @return Array 0 - path on disk, 1 - template name
	*/
	function GetTemplatePaths($filename)
	{
	if ($this->Application->IsAdmin() && isset($this->Application->ReplacementTemplates[$filename])) {
	$filename = $this->Application->ReplacementTemplates[$filename];
	}

	// allows to use non-replaced version of replaced template
	$filename = preg_replace('/^original:(.*)/', '\\1', $filename);

	if (preg_match('#^[\/]{0,1}([^\/])\/(.)#', $filename, $regs)) {
	$module_filename = $regs[2];
	$first_dir = $regs[1];
	}
	else {
	$first_dir = '';
	$module_filename = $filename;
	}

	// !preg_match for backward compatability with full-path plugins
	if ($this->Application->IsAdmin() && $first_dir == 'plugins' && !preg_match('/admin_templates/', $module_filename)) {
	if (preg_match('#^[\/]{0,1}([^\/])\/(.)#', $module_filename, $regs)) {;
	$path = MODULES_PATH.'/'.mb_strtolower($first_dir).'/'.$regs[1].'/admin_templates';
	$module_filename = $regs[2];
	}
	else {
	$first_dir = '';
	$module_filename = $filename;
	}
	}
	elseif ( $this->Application->IsAdmin() && $this->Application->findModule('Name', $first_dir)) {
	if ($first_dir == 'in-portal') {
	$first_dir = 'kernel';
	}
	$path = MODULES_PATH.'/'.mb_strtolower($first_dir).'/admin_templates';
	}
	+ elseif (preg_match('/^theme:(.*)/', $first_dir, $regs)) {
	+ // ability to use Front-End templates in admin
	+ $path = FULL_PATH . '/themes/' . $regs[1];
	+ }
	else {
	$path = $this->BasePath;
	$module_filename = $first_dir.'/'.$module_filename;
	}

	return Array ($path, $module_filename);
	}

	function LoadTemplate($filename, $title=NULL, $silent=0)
	{
	list ($path, $module_filename) = $this->GetTemplatePaths($filename);

	$template = new Template($path, $module_filename, $silent);
	if (!isset($title)) $title = $filename;
	$this->SetTemplate($title, $template);
	}

	function GetRealFilename($filename)
	{
	list ($path, $module_filename) = $this->GetTemplatePaths($filename);
	return $path.'/'.trim($module_filename, '/');
	}

	function SetTemplate($title, &$template, $filename=null)
	{
	if (!isset($filename)) $filename=$title;
	$this->Templates[$title] = $template;
	$this->FileNames[$title] = $filename;
	}

	function &GetTemplate($title, $silent=0)
	{
	if (!isset($this->Templates[$title])) {
	$this->LoadTemplate($title, null, $silent);
	}
	return $this->Templates[$title];
	}

	function GetTemplateBody($title, $silent=0)
	{
	$template =& $this->GetTemplate($title, $silent);
	if ( !is_object($template) ) {
	return '';
	}
	return $template->GetBody();
	}

	function GetTemplateFileName($title)
	{
	return getArrayValue($this->FileNames, $title);
	}

	function SetTemplateBody($title, $body)
	{
	$template = new Template();
	$template->SetBody($body);
	$this->SetTemplate($title, $template);
	}

	function ParseTemplate($template_name)
	{
	$Parser = new TemplateParser($this->Application);
	return $Parser->Parse( $this->GetTemplateBody($template_name) );
	}

	function TemplateExists($filename)
	{
	$real_file = $this->GetRealFilename($filename);
	if (!preg_match('/\.tpl$/', $real_file)) {
	$real_file .= '.tpl';
	}
	return file_exists($real_file);
	}


	function GetPreParsed($template)
	{
	$real_name = $this->GetRealFilename($template);
	$fname = $real_name.'.php';
	$fname = str_replace(FULL_PATH, defined('WRITEABLE') ? WRITEABLE.'/cache' : FULL_PATH.'/kernel/cache', $fname);

	$tname = $real_name.'.tpl';
	if (!file_exists($tname)) {
	return false;
	}

	if (defined('SAFE_MODE') && SAFE_MODE) {
	$conn =& $this->Application->GetADODBConnection();
	$cached = $conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'Cache WHERE VarName = "'.$fname.'"');
	if ($cached !== false && $cached['Cached'] > filemtime($tname)) {
	return array('active' => 1, 'fname' => $fname, 'tname' => $tname, 'mode' => 'db', 'content' => $cached['Data']);
	}
	}
	else {
	if (file_exists($fname) && file_exists($tname) && filemtime($fname) > filemtime($tname)) {
	return array('active' => 1, 'fname' => $fname, 'tname' => $tname, 'mode' => 'file');
	}
	if (!file_exists($fname)) {
	// make sure to create directory if pre-parsed file does not exist
	$this->CheckDir(dirname($fname), defined('WRITEABLE') ? WRITEABLE.'/cache' : FULL_PATH.'/kernel/cache');
	}
	}
	return array('active' => 0, 'fname' => $fname, 'tname' => $tname, 'mode'=>'file');
	}

	/**
	* Recursive mkdir
	*
	* @param string $dir
	* @param string $base_path base path to directory where folders should be created in
	*/
	function CheckDir($dir, $base_path = '')
	{
	if (file_exists($dir)) {
	return;
	}
	else {
	// remove $base_path from beggining because it is already created during install
	$dir = preg_replace('/^'.preg_quote($base_path.'/', '/').'/', '', $dir, 1);
	$segments = explode('/', $dir);
	$cur_path = $base_path;

	foreach ($segments as $segment) {
	// do not add leading / for windows paths (c:\...)
	$cur_path .= preg_match('/^[a-zA-Z]{1}:/', $segment) ? $segment : '/'.$segment;
	if (!file_exists($cur_path)) {
	mkdir($cur_path);
	}
	}
	}
	}

	}


	?>
	\ No newline at end of file

	Property changes on: branches/RC/core/kernel/parser/template.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.26.2.2
	\ No newline at end of property
	+1.26.2.3
	\ No newline at end of property
	Index: branches/RC/core/units/admin/admin_tag_processor.php
	===================================================================
	--- branches/RC/core/units/admin/admin_tag_processor.php (revision 11213)
	+++ branches/RC/core/units/admin/admin_tag_processor.php (revision 11214)
	@@ -1,1024 +1,1045 @@
	<?php

	class AdminTagProcessor extends kDBTagProcessor {

	function SetConst($params)
	{
	$name = $this->SelectParam($params, 'name,const');
	safeDefine($name, $params['value']);
	}

	/**
	* Allows to execute js script after the page is fully loaded
	*
	* @param Array $params
	* @return string
	*/
	function AfterScript($params)
	{
	$after_script = $this->Application->GetVar('after_script');
	if ($after_script) {
	return '<script type="text/javascript">'.$after_script.'</script>';
	}
	return '';
	}

	/**
	* Returns section title with #section# keyword replaced with current section
	*
	* @param Array $params
	* @return string
	*/
	function GetSectionTitle($params)
	{
	if (array_key_exists('default', $params)) {
	return $params['default'];
	}

	return $this->Application->Phrase( replaceModuleSection($params['phrase']) );
	}

	/**
	* Returns section icon with #section# keyword replaced with current section
	*
	* @param Array $params
	* @return string
	*/
	function GetSectionIcon($params)
	{
	return replaceModuleSection($params['icon']);
	}

	/**
	* Allows to detect if current template is one of listed ones
	*
	* @param Array $params
	* @return int
	*/
	function TemplateMatches($params)
	{
	$templates = explode(',' ,$params['templates']);
	$t = $this->Application->GetVar('t');
	return in_array($t, $templates) ? 1 : 0;
	}

	/**
	* Save return script in cases, when old sections are opened from new sections
	*
	* @param Array $params
	*/
	function SaveReturnScript($params)
	{
	// admin/save_redirect.php?do=
	$m =& $this->Application->recallObject('m_TagProcessor');
	$url = str_replace($this->Application->BaseURL(), '', $m->Link($params) );
	$url = explode('?', $url, 2);
	$url = 'save_redirect.php?'.$url[1].'&do='.$url[0];

	$this->Application->StoreVar('ReturnScript', $url);
	}

	/**
	* Returns version of module by name
	*
	* @param Array $params
	* @return string
	*/
	function ModuleVersion($params)
	{
	return $this->Application->findModule('Name', $params['module'], 'Version');
	}

	/**
	* Used in table form section drawing
	*
	* @param Array $params
	* @return string
	*/
	function DrawTree($params)
	{
	static $deep_level = 0;

	// when processings, then sort children by priority (key of children array)
	$ret = '';
	$section_name = $params['section_name'];
	$params['name'] = $this->SelectParam($params, 'name,render_as,block');
	$sections_helper =& $this->Application->recallObject('SectionsHelper');
	$section_data =& $sections_helper->getSectionData($section_name);

	$params['children_count'] = isset($section_data['children']) ? count($section_data['children']) : 0;
	$params['deep_level'] = $deep_level++;
	$template = $section_data['url']['t'];
	unset($section_data['url']['t']);
	$section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']);
	$ret .= $this->Application->ParseBlock( array_merge_recursive2($params, $section_data) );
	if (!isset($section_data['children'])) {
	return $ret;
	}

	$debug_mode = $this->Application->isDebugMode();
	$super_admin_mode = $this->Application->RecallVar('super_admin');

	ksort($section_data['children'], SORT_NUMERIC);
	foreach ($section_data['children'] as $section_name) {
	$section_data =& $sections_helper->getSectionData($section_name);

	if (isset($section_data['show_mode']) && is_numeric($section_data['show_mode'])) {
	$show_mode = $section_data['show_mode'];
	// if super admin section -> show in super admin mode & debug mode
	$show_section = (($show_mode & smSUPER_ADMIN) == smSUPER_ADMIN) && ($super_admin_mode \|\| $debug_mode);
	if (!$show_section) {
	// if section is in debug mode only && debug mode -> show
	$show_section = (($show_mode & smDEBUG) == smDEBUG) && $debug_mode;
	}
	if (!$show_section) {
	continue;
	}
	}

	$params['section_name'] = $section_name;
	$ret .= $this->DrawTree($params);
	$deep_level--;
	}


	return $ret;
	}


	function SectionInfo($params)
	{
	$section = $params['section'];
	if ($section == '#session#') {
	$section = $this->Application->RecallVar('section');
	}

	$sections_helper =& $this->Application->recallObject('SectionsHelper');
	/* @var $sections_helper kSectionsHelper */

	$section_data =& $sections_helper->getSectionData($section);

	if (isset($params['parent']) && $params['parent']) {
	do {
	$section_data =& $sections_helper->getSectionData($section_data['parent']);
	} while (isset($section_data['use_parent_header']) && $section_data['use_parent_header']);
	}

	$info = $params['info'];
	switch ($info) {
	case 'module_path':
	if (isset($params['module']) && $params['module']) {
	$module = $params['module'];
	}
	elseif (isset($section_data['icon_module'])) {
	$module = $section_data['icon_module'];
	}
	else {
	$module = '#session#';
	}
	$res = $this->ModulePath(array('module' => $module));
	break;

	case 'perm_section':
	$res = $sections_helper->getPermSection($section);
	break;

	default:
	$res = $section_data[$info];
	}

	if ($info == 'label' \|\| isset($params['as_label'])) {
	$res = $this->Application->Phrase($res);
	}
	return $res;
	}


	function PrintSection($params)
	{
	$section_name = $params['section_name'];
	if ($section_name == '#session#') {
	$section_name = $this->Application->RecallVar('section');
	}

	$sections_helper =& $this->Application->recallObject('SectionsHelper');
	/* @var $sections_helper kSectionsHelper */

	if (isset($params['use_first_child']) && $params['use_first_child']) {
	$section_name = $sections_helper->getFirstChild($section_name, true);
	}

	$section_data =& $sections_helper->getSectionData($section_name);

	$params['name'] = $this->SelectParam($params, 'name,render_as,block');
	$params['section_name'] = $section_name;

	$template = $section_data['url']['t'];
	unset($section_data['url']['t']);

	$section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']);
	$ret = $this->Application->ParseBlock( array_merge_recursive2($params, $section_data) );

	return $ret;
	}

	/**
	* Used in XML drawing for tree
	*
	* @param Array $params
	* @return string
	*/
	function PrintSections($params)
	{
	// when processings, then sort children by priority (key of children array)
	$ret = '';
	$section_name = $params['section_name'];
	if ($section_name == '#session#') {
	$section_name = $this->Application->RecallVar('section');
	}

	$sections_helper =& $this->Application->recallObject('SectionsHelper');
	/* @var $sections_helper kSectionsHelper */

	$section_data =& $sections_helper->getSectionData($section_name);

	$params['name'] = $this->SelectParam($params, 'name,render_as,block');
	if (!isset($section_data['children'])) {
	return '';
	}

	$debug_mode = $this->Application->isDebugMode();
	$super_admin_mode = $this->Application->RecallVar('super_admin');

	ksort($section_data['children'], SORT_NUMERIC);
	foreach ($section_data['children'] as $section_name) {
	$params['section_name'] = $section_name;
	$section_data =& $sections_helper->getSectionData($section_name);

	if (isset($section_data['show_mode']) && is_numeric($section_data['show_mode'])) {
	$show_mode = $section_data['show_mode'];
	// if super admin section -> show in super admin mode & debug mode
	$show_section = (($show_mode & smSUPER_ADMIN) == smSUPER_ADMIN) && ($super_admin_mode \|\| $debug_mode);
	if (!$show_section) {
	// if section is in debug mode only && debug mode -> show
	$show_section = (($show_mode & smDEBUG) == smDEBUG) && $debug_mode;
	}
	if (!$show_section) {
	continue;
	}
	}

	if (isset($section_data['tabs_only']) && $section_data['tabs_only']) {
	$perm_status = false;
	$folder_label = $section_data['label'];
	ksort($section_data['children'], SORT_NUMERIC);
	foreach ($section_data['children'] as $priority => $section_name) {
	// if only tabs in this section & none of them have permission, then skip section too

	$section_name = $sections_helper->getPermSection($section_name);
	$perm_status = $this->Application->CheckPermission($section_name.'.view', 1);
	if ($perm_status) {
	break;
	}
	}
	if (!$perm_status) {
	// no permission for all tabs -> don't display tree node either
	continue;
	}

	$params['section_name'] = $section_name;
	$section_data =& $sections_helper->getSectionData($section_name);
	$section_data['label'] = $folder_label; // use folder label in tree
	$section_data['is_tab'] = 1;
	}
	else {
	$section_name = $sections_helper->getPermSection($section_name);
	if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;
	}

	$params['children_count'] = isset($section_data['children']) ? count($section_data['children']) : 0;

	$template = $section_data['url']['t'];
	unset($section_data['url']['t']);

	$section_data['section_url'] = $this->Application->HREF($template, '', $section_data['url']);

	$late_load = getArrayValue($section_data, 'late_load');
	if ($late_load) {
	$t = $late_load['t'];
	unset($late_load['t']);
	$section_data['late_load'] = $this->Application->HREF($t, '', $late_load);
	$params['children_count'] = 99;
	}
	else {
	$section_data['late_load'] = '';
	}

	$ret .= $this->Application->ParseBlock( array_merge_recursive2($params, $section_data) );
	$params['section_name'] = $section_name;
	}

	return preg_replace("/\r\n\|\n/", '', $ret);
	}

	function ListSectionPermissions($params)
	{
	$section_name = isset($params['section_name']) ? $params['section_name'] : $this->Application->GetVar('section_name');
	$sections_helper =& $this->Application->recallObject('SectionsHelper');
	$section_data =& $sections_helper->getSectionData($section_name);

	$block_params = array_merge_recursive2($section_data, Array('name' => $params['render_as'], 'section_name' => $section_name));

	$ret = '';
	foreach ($section_data['permissions'] as $perm_name) {
	if (preg_match('/^advanced:(.*)/', $perm_name) != $params['type']) continue;
	$block_params['perm_name'] = $perm_name;
	$ret .= $this->Application->ParseBlock($block_params);
	}
	return $ret;
	}

	function ModuleInclude($params)
	{
	foreach ($params as $param_name => $param_value) {
	$params[$param_name] = replaceModuleSection($param_value);
	}

	$m =& $this->Application->recallObject('m_TagProcessor');
	return $m->ModuleInclude($params);
	}

	function TodayDate($params)
	{
	return date($params['format']);
	}

	function TreeEditWarrning($params)
	{
	$ret = $this->Application->Phrase($params['label']);
	$ret = str_replace(Array('<', '>', 'br/', 'br /', "\n", "\r"), Array('<', '>', 'br', 'br', '', ''), $ret);
	if (getArrayValue($params, 'escape')) {
	$ret = addslashes($ret);
	}
	$ret = str_replace('<br>', '\n', $ret);
	return $ret;
	}

	/**
	* Draws section tabs using block name passed
	*
	* @param Array $params
	*/
	function ListTabs($params)
	{
	$sections_helper =& $this->Application->recallObject('SectionsHelper');
	$section_data =& $sections_helper->getSectionData($params['section_name']);

	$ret = '';
	$block_params = Array('name' => $params['render_as']);
	ksort($section_data['children'], SORT_NUMERIC);
	foreach ($section_data['children'] as $priority => $section_name) {
	if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;

	$tab_data =& $sections_helper->getSectionData($section_name);
	$block_params['t'] = $tab_data['url']['t'];
	$block_params['title'] = $tab_data['label'];
	$block_params['main_prefix'] = $section_data['SectionPrefix'];
	$ret .= $this->Application->ParseBlock($block_params);
	}


	return $ret;
	}

	/**
	* Returns list of module item tabs that have view permission in current category
	*
	* @param Array $params
	*/
	function ListCatalogTabs($params)
	{
	$ret = '';
	$special = isset($params['special']) ? $params['special'] : '';
	$replace_main = isset($params['replace_m']) && $params['replace_m'];
	$skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array();
	$block_params = Array('name' => $params['render_as']);
	foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
	$prefix = $module_info['Var'];

	if (in_array($prefix, $skip_prefixes) \|\| !$this->Application->prefixRegistred($prefix) \|\| !$this->Application->getUnitOption($prefix, 'CatalogItem')) {
	continue;
	}
	if ($prefix == 'm' && $replace_main) {
	$prefix = 'c';
	}

	$label = $this->Application->getUnitOption($prefix, $params['title_property']);
	$block_params['title'] = $label;
	$block_params['prefix'] = $prefix;
	$ret .= $this->Application->ParseBlock($block_params);
	}
	return $ret;
	}

	/**
	* Allows to construct link for opening any type of catalog item selector
	*
	* @param Array $params
	* @return string
	*/
	function SelectorLink($params)
	{
	$mode = 'catalog';
	if (isset($params['mode'])) { // {catalog, advanced_view}
	$mode = $params['mode'];
	unset($params['mode']);
	}

	$params['t'] = 'catalog/item_selector/item_selector_'.$mode;

	$default_params = Array('no_amp' => 1, 'pass' => 'all,'.$params['prefix']);
	unset($params['prefix']);

	$pass_through = Array();
	if (isset($params['tabs_dependant'])) { // {yes, no}
	$pass_through['td'] = $params['tabs_dependant'];
	unset($params['tabs_dependant']);
	}

	if (isset($params['selection_mode'])) { // {single, multi}
	$pass_through['tm'] = $params['selection_mode'];
	unset($params['selection_mode']);
	}

	if (isset($params['tab_prefixes'])) { // {all, none, <comma separated prefix list}
	$pass_through['tp'] = $params['tab_prefixes'];
	unset($params['tab_prefixes']);
	}

	if ($pass_through) {
	// add pass_through to selector url if any
	$params['pass_through'] = implode(',', array_keys($pass_through));
	$params = array_merge_recursive2($params, $pass_through);
	}

	// user can override default parameters (except pass_through of course)
	$params = array_merge_recursive2($default_params, $params);

	$main_processor =& $this->Application->recallObject('m_TagProcessor');
	return $main_processor->T($params);
	}

	function TimeFrame($params)
	{
	$w = adodb_date('w');
	$m = adodb_date('m');
	$y = adodb_date('Y');
	//FirstDayOfWeek is 0 for Sunday and 1 for Monday
	$fdow = $this->Application->ConfigValue('FirstDayOfWeek');
	if ($fdow && $w == 0) $w = 7;
	$today_start = adodb_mktime(0,0,0,adodb_date('m'),adodb_date('d'),$y);
	$first_day_of_this_week = $today_start - ($w - $fdow)*86400;
	$first_day_of_this_month = adodb_mktime(0,0,0,$m,1,$y);
	$this_quater = ceil($m/3);
	$this_quater_start = adodb_mktime(0,0,0,$this_quater*3-2,1,$y);

	switch ($params['type']) {
	case 'last_week_start':
	$timestamp = $first_day_of_this_week - 86400*7;
	break;
	case 'last_week_end':
	$timestamp = $first_day_of_this_week - 1;
	break;

	case 'last_month_start':
	$timestamp = $m == 1 ? adodb_mktime(0,0,0,12,1,$y-1) : adodb_mktime(0,0,0,$m-1,1,$y);
	break;
	case 'last_month_end':
	$timestamp = $first_day_of_this_month = adodb_mktime(0,0,0,$m,1,$y) - 1;
	break;

	case 'last_quater_start':
	$timestamp = $this_quater == 1 ? adodb_mktime(0,0,0,10,1,$y-1) : adodb_mktime(0,0,0,($this_quater-1)*3-2,1,$y);
	break;
	case 'last_quater_end':
	$timestamp = $this_quater_start - 1;
	break;

	case 'last_6_months_start':
	$timestamp = $m <= 6 ? adodb_mktime(0,0,0,$m+6,1,$y-1) : adodb_mktime(0,0,0,$m-6,1,$y);
	break;

	case 'last_year_start':
	$timestamp = adodb_mktime(0,0,0,1,1,$y-1);
	break;
	case 'last_year_end':
	$timestamp = adodb_mktime(23,59,59,12,31,$y-1);
	break;
	}


	if (isset($params['format'])) {
	$format = $params['format'];
	if(preg_match("/_regional_(.*)/", $format, $regs))
	{
	$lang =& $this->Application->recallObject('lang.current');
	$format = $lang->GetDBField($regs[1]);
	}
	return adodb_date($format, $timestamp);
	}

	return $timestamp;

	}

	/**
	* Redirect to cache rebuild template, when required by installator
	*
	* @param Array $params
	*/
	function CheckPermCache($params)
	{
	$sql = 'SELECT Data
	FROM '.TABLE_PREFIX.'Cache
	WHERE VarName = "ForcePermCacheUpdate"';
	if ($this->Application->isModuleEnabled('In-Portal') && $this->Conn->GetOne($sql)) {
	$this->Application->Redirect($params['cache_update_t'], array('continue' => 1));
	}
	}

	/**
	* Checks if current protocol is SSL
	*
	* @param Array $params
	* @return int
	*/
	function IsSSL($params)
	{
	return (PROTOCOL == 'https://')? 1 : 0;
	}

	function PrintColumns($params)
	{
	$picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
	$picker_helper->SetGridName($this->Application->GetLinkedVar('grid_name'));
	/* @var $picker_helper kColumnPickerHelper */

	$main_prefix = $this->Application->RecallVar('main_prefix');
	$cols = $picker_helper->LoadColumns($main_prefix);

	$this->Application->Phrases->AddCachedPhrase('__FREEZER__', '-------------');

	$o = '';
	if (isset($params['hidden']) && $params['hidden']) {
	foreach ($cols['hidden_fields'] as $col) {
	$title = $this->Application->Phrase($cols['titles'][$col]);
	$o .= "<option value='$col'>".$title;
	}
	}
	else {
	foreach ($cols['order'] as $col) {
	if (in_array($col, $cols['hidden_fields'])) continue;
	$title = $this->Application->Phrase($cols['titles'][$col]);
	$o .= "<option value='$col'>".$title;
	}
	}
	return $o;
	}

	/**
	* Allows to set popup size (key - current template name)
	*
	* @param Array $params
	*/
	function SetPopupSize($params)
	{
	$width = $params['width'];
	$height = $params['height'];

	if ($this->Application->GetVar('ajax') == 'yes') {
	// during AJAX request just output size
	die($width.'x'.$height);
	}

	if (!$this->UsePopups($params)) {
	return ;
	}

	$t = $this->Application->GetVar('t');
	$sql = 'SELECT *
	FROM '.TABLE_PREFIX.'PopupSizes
	WHERE TemplateName = '.$this->Conn->qstr($t);
	$popup_info = $this->Conn->GetRow($sql);
	if (!$popup_info) {
	// create new popup size record
	$fields_hash = Array (
	'TemplateName' => $t,
	'PopupWidth' => $width,
	'PopupHeight' => $height,
	);
	$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'PopupSizes');
	}
	elseif ($popup_info['PopupWidth'] != $width \|\| $popup_info['PopupHeight'] != $height) {
	// popup found and size in tag differs from one in db -> update in db
	$fields_hash = Array (
	'PopupWidth' => $width,
	'PopupHeight' => $height,
	);
	$this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'PopupSizes', 'PopupId = '.$popup_info['PopupId']);
	}
	}

	/**
	* Returns popup size (by template), if not cached, then parse template to get value
	*
	* @param Array $params
	* @return string
	*/
	function GetPopupSize($params)
	{
	$t = $this->Application->GetVar('template_name');
	$sql = 'SELECT *
	FROM '.TABLE_PREFIX.'PopupSizes
	WHERE TemplateName = '.$this->Conn->qstr($t);
	$popup_info = $this->Conn->GetRow($sql);
	if (!$popup_info) {
	$this->Application->InitParser();
	$this->Application->ParseBlock(array('name' => $t)); // dies when SetPopupSize tag found & in ajax requrest
	return '750x400'; // tag SetPopupSize not found in template -> use default size
	}
	return $popup_info['PopupWidth'].'x'.$popup_info['PopupHeight'];
	}

	function UsePopups($params)
	{
	return (int)$this->Application->ConfigValue('UsePopups') \|\| $this->Application->GetVar('_force_popup');
	}

	function UseToolbarLabels($params)
	{
	return (int)$this->Application->ConfigValue('UseToolbarLabels');
	}

	/**
	* Checks if debug mode enabled (optionally) and specified constant is on
	*
	* @param Array $params
	* @return bool
	*/
	function ConstOn($params)
	{
	$constant_name = $this->SelectParam($params, 'name,const');
	$debug_mode = isset($params['debug_mode']) && $params['debug_mode'] ? $this->Application->isDebugMode() : true;
	return $debug_mode && constOn($constant_name);
	}

	/**
	* Builds link to last template in main frame of admin
	*
	* @param Array $params
	* @return string
	*/
	function MainFrameLink($params)
	{
	$persistent = isset($params['persistent']) && $params['persistent'];
	if ($persistent && $this->Application->ConfigValue('RememberLastAdminTemplate')) {
	// check last_template in persistent session
	$last_template = $this->Application->RecallPersistentVar('last_template_popup');
	}
	else {
	// check last_template in session
	$last_template = $this->Application->RecallVar('last_template_popup'); // because of m_opener=s there
	}

	if (!$last_template) {
	$params['persistent'] = 1;
	return $persistent ? false : $this->MainFrameLink($params);
	}

	list($index_file, $env) = explode('\|', $last_template);
	$vars = $this->Application->HttpQuery->processQueryString($env, 'pass');
	$recursion_templates = Array ('login', 'index', 'no_permission');

	if (isset($vars['admin']) && $vars['admin'] == 1) {
	// index template doesn't begin recursion on front-end (in admin frame)
	$vars['m_theme'] = '';

	if (isset($params['m_opener']) && $params['m_opener'] == 'r') {
	// front-end link for highlighting purposes
	$vars['t'] = 'index';
	$vars['m_cat_id'] = $this->Application->findModule('Name', 'Proj-CMS', 'RootCat');
	}

	unset($recursion_templates[ array_search('index', $recursion_templates)]);
	}

	if (in_array($vars['t'], $recursion_templates)) {
	// prevents redirect recursion OR old in-portal pages
	$params['persistent'] = 1;
	return $persistent ? false : $this->MainFrameLink($params);
	}

	$vars = array_merge_recursive2($vars, $params);
	$t = $vars['t'];
	unset($vars['t'], $vars['persistent']);

	return $this->Application->HREF($t, '', $vars, $index_file);
	}

	/**
	* Returns menu frame width or 200 in case, when invalid width specified in config
	*
	* @param Array $params
	* @return string
	*/
	function MenuFrameWidth($params)
	{
	$width = (int)$this->Application->ConfigValue('MenuFrameWidth');

	return $width > 0 ? $width : 200;
	}

	function AdminSkin($params)
	{
	static $style;
	if (!isset($style)) {
	$style = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'Skins WHERE IsPrimary = 1');
	}

	$css_path = (defined('WRITEABLE') ? WRITEABLE : FULL_PATH.'/kernel') . '/user_files';
	$css_url = $this->Application->BaseURL(defined('WRITEBALE_BASE') ? WRITEBALE_BASE : '/kernel') . 'user_files/';

	if (isset($params['type']) && $params['type'] == 'logo') {
	return $style['Logo'] ? $css_url.$style['Logo'] : '';
	}

	$last_compiled = $style['LastCompiled'];

	$style_name = mb_strtolower( $style['Name'] );

	if( file_exists($css_path.'/'.'admin-'.$style_name.'-'.$last_compiled.'.css') )
	{
	$ret = $css_url.'admin-'.$style_name.'-'.$last_compiled.'.css';

	}
	else
	{
	// search for previously compiled stylesheet
	$last_compiled = 0;
	if( $dh = opendir($css_path) )
	{
	while( ($file = readdir($dh)) !== false )
	{
	if( preg_match('/admin-(.*)-([\d]+).css/', $file, $rets) )
	{
	if( $rets[1] == $style_name && $rets[2] > $last_compiled ) $last_compiled = $rets[2];
	}
	}
	closedir($dh);
	}
	if ($last_compiled) {
	// found
	$ret = $css_url.'admin-'.$style_name.'-'.$last_compiled.'.css';
	}
	else {
	// not found (try to compile on the fly)
	$object =& $this->Application->recallObject('skin.-item', null, Array ('skip_autoload' => true));
	/* @var $object kDBItem */

	$skin_eh =& $this->Application->recallObject('skin_EventHandler');
	/* @var $skin_eh SkinEventHandler */

	$object->Load(1, 'IsPrimary');
	$skin_eh->Compile($object);
	$ret = $css_url.'admin-'.$style_name.'-'.adodb_mktime().'.css';
	}
	}

	if (isset($params['file_only'])) return $ret;

	return '<link rel="stylesheet" rev="stylesheet" href="'.$ret.'" type="text/css" media="screen" />';
	}

	function PrintCompileErrors($params)
	{
	- $errors = unserialize($this->Application->RecallVar('compile_errors'));
	- $o = '<table class="edit-form" style="width: 100%;" border="1"><tr><td><b>File</b></td><td><b>Line</b></td><td><b>Message</b></td></tr>';
	- $class = 'table-color1';
	+ $block_params = $this->prepareTagParams($params);
	+ $block_params['name'] = $params['render_as'];
	+
	+ $errors = $this->Application->RecallVar('compile_errors');
	+ if (!$errors) {
	+ return ;
	+ }
	+
	+ $ret = '';
	+ $errors = unserialize($errors);
	+
	foreach ($errors as $an_error) {
	- $f = str_replace(FULL_PATH, '', $an_error['file']);
	- $o .= "<tr class=\'$class\'><td>{$f}</td><td>{$an_error['line']}</td><td>{$an_error['msg']}</td></tr>";
	- $class = $class == 'table-color1' ? 'table-color2' : 'table-color1';
	+ $block_params['file'] = str_replace(FULL_PATH, '', $an_error['file']);
	+ $block_params['line'] = $an_error['line'];
	+ $block_params['message'] = $an_error['msg'];
	+
	+ $ret .= $this->Application->ParseBlock($block_params);
	}
	- $o .= '</table>';
	+
	$this->Application->RemoveVar('compile_errors');
	- return $o;
	+
	+ return $ret;
	+ }
	+
	+ function CompileErrorCount($params)
	+ {
	+ $errors = $this->Application->RecallVar('compile_errors');
	+ if (!$errors) {
	+ return 0;
	+ }
	+
	+ return count( unserialize($errors) );
	}

	function ExportData($params)
	{
	$export_helper =& $this->Application->recallObject('CSVHelper');
	/* @var $export_helper kCSVHelper */
	$result = $export_helper->ExportData( $this->SelectParam($params, 'var,name,field') );
	return ($result === false) ? '' : $result;
	}

	function ImportData($params)
	{
	$import_helper =& $this->Application->recallObject('CSVHelper');
	/* @var $import_helper kCSVHelper */
	$result = $import_helper->ImportData( $this->SelectParam($params, 'var,name,field') );
	return ($result === false) ? '' : $result;
	}

	function PrintCSVNotImportedLines($params)
	{
	$import_helper =& $this->Application->recallObject('CSVHelper');
	/* @var $import_helper kCSVHelper */
	return $import_helper->GetNotImportedLines();
	}

	/**
	* Returns input field name to
	* be placed on form (for correct
	* event processing)
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function InputName($params)
	{
	list($id, $field) = $this->prepareInputName($params);

	$ret = $this->getPrefixSpecial().'[0]['.$field.']'; // 0 always, as has no idfield
	if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
	return $ret;
	}

	/**
	* Returns list of all backup file dates formatted
	* in passed block
	*
	* @param Array $params
	* @return string
	* @access public
	*/
	function PrintBackupDates($params)
	{
	$datearray = $this->getDirList($this->Application->ConfigValue('Backup_Path'));
	$ret = '';
	foreach($datearray as $key => $value)
	{
	$params['backuptimestamp'] = $value['filedate'];
	$params['backuptime'] = date('F j, Y, g:i a', $value['filedate']);
	$params['backupsize'] = round($value['filesize']/1024/1024, 2); // MBytes
	$ret .= $this->Application->ParseBlock($params);
	}
	return $ret;
	}

	function getDirList ($dirName)
	{
	$fileinfo = array();
	$d = dir($dirName);

	while($entry = $d->read())
	{
	if ($entry != "." && $entry != "..")
	{
	if (!is_dir($dirName."/".$entry) && eregi("dump",$entry))
	{
	$fileinfo[]= Array('filedate' => $this->chopchop($entry),
	'filesize' => filesize($dirName. '/'. $entry)
	);
	}
	}
	}
	$d->close();
	rsort($fileinfo);

	return $fileinfo;

	}

	function chopchop ($filename)
	{
	$p = pathinfo($filename);
	$ext = '.'.$p["extension"];
	$filename;
	$filename= ereg_replace("dump","",$filename);
	$filename= ereg_replace($ext,"",$filename);
	return $filename;
	}

	function PrintPHPinfo($params)
	{
	ob_start();

	phpinfo();
	$php_info .= ob_get_contents();

	ob_end_clean();

	$php_info = str_replace(" width=\"600\"", " width=\"100%\" align=\"center\"", $php_info);
	$php_info = str_replace("</body>", "", $php_info);
	$php_info = str_replace("<body>", "", $php_info);
	$php_info = str_replace("</html>", "", $php_info);
	$php_info = str_replace("<html>", "", $php_info);
	$php_info = str_replace("</head>", "", $php_info);
	$php_info = str_replace("<head>", "", $php_info);

	$offset = strpos($php_info, "<table");

	$php_info = substr($php_info, $offset);

	$php_info = '<style type="text/css">
	body {background-color: #ffffff; color: #000000;}
	body, td, th, h1, h2 {font-family: sans-serif;}
	pre {margin: 0px; font-family: monospace;}
	a:link {color: #000099; text-decoration: none; background-color: #ffffff;}
	a:hover {text-decoration: underline;}
	table {border-collapse: collapse;}
	.center {text-align: center;}
	.center table { margin-left: auto; margin-right: auto; text-align: left;}
	.center th { text-align: center !important; }
	td, th { border: 1px solid #000000; font-size: 75%; vertical-align: baseline;}
	h1 {font-size: 150%;}
	h2 {font-size: 125%;}
	.p {text-align: left;}
	.e {background-color: #ccccff; font-weight: bold; color: #000000;}
	.h {background-color: #9999cc; font-weight: bold; color: #000000;}
	.v {background-color: #cccccc; color: #000000;}
	i {color: #666666; background-color: #cccccc;}
	hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #000000;}
	</style>'.$php_info;

	return $php_info;

	}

	function PrintSqlCols($params)
	{
	$a_data = unserialize($this->Application->GetVar('sql_rows'));
	$ret = '';
	$block = $params['render_as'];
	foreach ($a_data AS $a_row)
	{
	foreach ($a_row AS $col => $value)
	{
	$ret .= $this->Application->ParseBlock(Array('name'=>$block, 'value'=>$col));
	}
	break;
	}
	return $ret;
	}

	function PrintSqlRows($params)
	{
	$a_data = unserialize($this->Application->GetVar('sql_rows'));
	$ret = '';
	$block = $params['render_as'];
	foreach ($a_data AS $a_row)
	{
	$cells = '';
	foreach ($a_row AS $col => $value)
	{
	$cells .= '<td>'.$value.'</td>';
	}
	$ret .= $this->Application->ParseBlock(Array('name'=>$block, 'cells'=>$cells));
	}
	return $ret;
	}

	/**
	* Prints available and enabled import sources using given block
	*
	* @param Array $params
	* @return string
	*/
	function PrintImportSources($params)
	{
	$sql = 'SELECT *
	FROM ' . TABLE_PREFIX . 'ImportScripts
	WHERE (Status = ' . STATUS_ACTIVE . ') AND (Type = "CSV")';
	$import_sources = $this->Conn->Query($sql);

	$block_params = $this->prepareTagParams($params);
	$block_params['name'] = $params['render_as'];

	$ret = '';
	foreach ($import_sources as $import_source) {
	$block_params['script_id'] = $import_source['ImportId'];
	$block_params['script_module'] = $import_source['Module'];
	$block_params['script_name'] = $import_source['Name'];
	$block_params['script_prefix'] = $import_source['Prefix'];

	$ret .= $this->Application->ParseBlock($block_params);
	}

	return $ret;
	}
	}

	?>
	\ No newline at end of file

	Property changes on: branches/RC/core/units/admin/admin_tag_processor.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.43.2.22
	\ No newline at end of property
	+1.43.2.23
	\ No newline at end of property
	Index: branches/RC/core/admin_templates/tools/compile_complete.tpl
	===================================================================
	--- branches/RC/core/admin_templates/tools/compile_complete.tpl (revision 11213)
	+++ branches/RC/core/admin_templates/tools/compile_complete.tpl (revision 11214)
	@@ -1,13 +1,52 @@
	-<inp2:m_include t="incs/header" nobody="yes"/>
	-
	-<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
	-
	-<inp2:m_RenderElement name="combined_header" section="in-portal:service" prefix="adm" title_preset="system_tools"/>
	-
	- <b>Errors</b>:<br/><br>
	-
	- <inp2:adm_PrintCompileErrors />
	+<inp2:m_include t="incs/header"/>
	+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="system_tools"/>

	+<!-- ToolBar --->
	+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
	+ <tbody>
	+ <tr>
	+ <td>
	+ <script type="text/javascript">
	+ var a_toolbar = new ToolBar();
	+ a_toolbar.AddButton(
	+ new ToolBarButton(
	+ 'cancel',
	+ '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>',
	+ function() {
	+ window.close();
	+ }
	+ )
	+ );
	+
	+ a_toolbar.Render();
	+ </script>
	+ </td>
	+ </tr>
	+ </tbody>
	</table>

	+<div id="scroll_container">
	+ <table class="edit-form" style="width: 100%;" border="1">
	+ <tr class="subsectiontitle">
	+ <td colspan="3">Errors (<inp2:adm_CompileErrorCount/>):</td>
	+ </tr>
	+
	+ <tr class="subsectiontitle">
	+ <td><strong>File</strong></td>
	+ <td><strong>Line</strong></td>
	+ <td><strong>Message</strong></td>
	+ </tr>
	+
	+ <inp2:m_DefineElement name="compile_error_element">
	+ <tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
	+ <td><inp2:m_Param name="file"/></td>
	+ <td><inp2:m_Param name="line"/></td>
	+ <td><inp2:m_Param name="message"/></td>
	+ </tr>
	+ </inp2:m_DefineElement>
	+
	+ <inp2:adm_PrintCompileErrors render_as="compile_error_element"/>
	+ </table>
	+</div>
	+
	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

	Property changes on: branches/RC/core/admin_templates/tools/compile_complete.tpl
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.1.2.2
	\ No newline at end of property
	+1.1.2.3
	\ No newline at end of property

in-portalNo OneTemporaryActions

File Metadata

in-portalView Options

Event Timeline

in-portal
No OneTemporary
Actions

in-portal
View Options