in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Sat, Jun 21, 2:49 PM

in-portal
View Options

	Index: trunk/kernel/include/theme.php
	===================================================================
	--- trunk/kernel/include/theme.php (revision 7412)
	+++ trunk/kernel/include/theme.php (revision 7413)
	@@ -1,829 +1,829 @@
	<?php
	define('THEME_ERROR_1', 'Theme folder not writable');
	define('THEME_ERROR_2', 'Template File Not Found');

	class clsThemeFile extends clsItem
	{
	var $Contents;
	var $Root;
	var $Errors = Array(); // global template error messages (not db related)

	function clsThemeFile($id=NULL)
	{
	$this->clsItem();
	$this->tablename = GetTablePrefix()."ThemeFiles";
	$this->id_field = "FileId";
	$this->NoResourceId=1;
	$this->Root = "";
	$this->Contents = '';
	if($id) $this->LoadFromDatabase($id);
	}

	function DetectChanges($name, $value)
	{
	global $objSession;

	if (!isset($this->Data[$name]) ) return false;

	if ( $this->Data[$name] != $value) {
	//echo "$name Modified tt ".$this->Data[$name]." tt $value<br>";
	if (!stristr($name, 'File') && !stristr($name, 'Theme')) {
	if ($objSession->GetVariable("HasChanges") != 1) {
	$objSession->SetVariable("HasChanges", 2);
	}
	}
	}
	}

	function ThemeRoot()
	{
	if( !$this->Root )
	{
	$t = new clsTheme( $this->Get("ThemeId") );
	$this->Root = $t->Get("Name");
	}
	return $this->Root;
	}

	function FullPath()
	{
	// need to rewrite (by Alex)
	global $objConfig, $pathchar,$pathtoroot;

	$template_path = Array();
	$template_path[] = FULL_PATH.'/themes/'.$this->ThemeRoot();
	$sub_folder = trim( $this->Get('FilePath'), ' /');
	if($sub_folder) $template_path[] = $sub_folder;
	$template_path[] = trim( $this->Get('FileName'), '/');

	//echo "Full Path is $path <br>\n";
	return implode('/', $template_path);
	}

	function Get($name)
	{
	if($name == 'Contents')
	return $this->Contents;
	else
	return parent::Get($name);
	}

	function Set($name, $value)
	{
	if( !is_array($name) )
	{
	$name = Array($name);
	$value = Array($value);
	}

	$i = 0; $field_count = count($name);
	while($i < $field_count)
	{
	if($name[$i] == 'Contents')
	$this->Contents = $value[$i];
	else
	parent::Set($name[$i], $value[$i]);
	$i++;
	}
	}
	/*
	function LoadFromDatabase($Id)
	{
	global $Errors;

	if(!isset($Id))
	{
	$Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromDatabase");
	return false;
	}
	$sql = sprintf("SELECT * FROM ".$this->tablename." WHERE ".$this->IdField()." = '%s'",$Id);
	$result = $this->adodbConnection->Execute($sql);
	if ($result === false)
	{
	$Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"LoadFromDatabase");
	return false;
	}

	$data = $result->fields;

	$this->SetFromArray($data);
	$this->Clean();
	return true;
	}
	*/

	function Delete()
	{
	$path = $this->FullPath();
	if($this->debuglevel) echo "Trying to delete file [$path]<br>";
	if( file_exists($path) ) @unlink($path);
	parent::Delete();
	}

	function LoadFileContents($want_return = true)
	{
	global $objConfig,$pathchar;

	$this->Contents = '';
	$path = $this->FullPath();

	if( file_exists($path) )
	$this->Contents = file_get_contents($path);
	else
	$this->SetError(THEME_ERROR_2, 2); // template not found
	if($want_return) return $this->Contents;
	}

	function SetError($msg, $code, $field = 'global_error')
	{
	$this->Errors[$field]['msg'] = $msg;
	$this->Errors[$field]['code'] = $code;
	}

	function HasError()
	{
	return count($this->Errors) ? 1 : 0;
	}

	function ErrorMsg()
	{
	return $this->Errors['global_error']['msg'];
	}

	function SaveFileContents($filecontents, $new_file = false)
	{
	$path = $this->FullPath();
	if( is_array($filecontents) ) $filecontents = implode("\n",$filecontents);

	if( $this->IsWriteablePath($new_file) )
	{
	$fp = fopen($path,"w");
	if($fp)
	{
	fwrite($fp,$filecontents);
	fclose($fp);
	return true;
	}
	}
	return false;
	}

	function IsWriteablePath($new_file = false)
	{

	$path = $this->FullPath();
	// $path = str_replace('//','/',$path);
	$ret = $new_file ? is_writable(dirname($path)): is_writable($path);

	if(!$ret)
	{
	$this->SetError(THEME_ERROR_1, 1);
	return false;
	}
	return $ret;
	}
	}

	class clsThemeFileList extends clsItemCollection
	{
	var $Page;
	var $PerPageVar;
	var $ThemeId;

	function clsThemeFileList($theme_id=NULL)
	{
	global $m_var_list;
	$this->clsItemCollection();
	$this->classname = "clsThemeFile";
	$this->Page=(int)$m_var_list["p"];
	$this->PerPageVar = "Perpage_ThemeFiles";
	$this->SourceTable = GetTablePrefix()."ThemeFiles";
	$this->AdminSearchFields = array("FileName","FilePath","Description");


	$this->ThemeId=$theme_id;
	//if($theme_id)
	// $this->LoadFiles($theme_id);
	}

	function LoadFiles($id,$where="",$orderBy="",$limit="")
	{
	global $objConfig;

	$this->Clear();
	$this->ThemeId=$id;
	$sql = "SELECT * FROM ".$this->SourceTable. " WHERE ThemeId=$id ";
	if(strlen(trim($where))) $sql .= ' AND '.$where." ";
	if(strlen(trim($orderBy))) $sql .= "ORDER BY $orderBy";
	if(strlen(trim($limit))) $sql .= $limit;

	if(strlen($this->PerPageVar))
	{
	$sql .= GetLimitSQL($this->Page,$objConfig->Get($this->PerPageVar));
	}
	//echo $sql;
	return $this->Query_Item($sql);
	}

	function GetFileByName($path,$name,$LoadFromDB=TRUE)
	{
	$found = FALSE;
	$f = FALSE;
	//echo "Looking through ".$this->NumItems()." Files <br>\n";
	if($this->NumItems()>0)
	{
	foreach($this->Items as $f)
	{
	if(($f->Get("FilePath")== $path) && ($f->Get("FileName")==$name))
	{
	$found = TRUE;
	break;
	}
	}
	}

	if(!$found && $LoadFromDB)
	{
	$sql = "SELECT * FROM ".$this->SourceTable." WHERE ThemeId=".$this->ThemeId." AND FileName LIKE '$name' AND FilePath LIKE '$path'";
	$rs = $this->adodbConnection->Execute($sql);
	//echo $sql."<br>\n";
	if($rs && !$rs->EOF)
	{
	$data = $rs->fields;
	$f =& $this->AddItemFromArray($data);
	}
	else
	$f = FALSE;
	}
	return $f;
	}

	function AddFile($Path,$Name,$ThemeId,$Type,$Description,$contents=NULL)
	{
	$f = new clsThemeFile();
	$f->Set(array("FilePath","FileName","ThemeId","FileType","Description"),
	array($Path,$Name,$ThemeId,$Type,$Description));
	$f->Create();
	if($contents!==NULL)
	{
	$f->SaveFileContents($contents,$Name);
	}
	//echo $f->Get("FilePath")."/".$f->Get("FileName")."<br>\n";
	return $f;
	}

	function EditFile($FileId,$Path,$Name,$ThemeId,$Type,$Description,$contents=NULL)
	{
	$f = $this->GetItem($FileId);
	$f->Set(array("FilePath","FileName","ThemeId","FileType","Description"),
	array($Path,$Name,$ThemeId,$Type,$Description));
	$f->Update();
	if($Contents!=NULL)
	$f->SaveFileContents($Contents);

	return $f;
	}

	function DeleteFile($FileId)
	{
	$f = $this->GetItem($FileId);
	$f->Delete();
	}

	function DeleteAll()
	{
	$this->Clear();
	$this->LoadFiles($this->ThemeId);
	foreach($this->Items as $f)
	$f->Delete();
	$this->Clear();
	}

	function SetFileContents($FileId,$Contents)
	{
	$f = $this->GetItem($FileId);
	$f->SaveFileContents($Contents);
	}

	function GetFileContents($FileId)
	{
	$f = $this->GetItem($FileId);
	return $f->LoadFileContents();
	}

	function FindMissingFiles($path, $where = null, $OrderBy = null, $limit = null)
	{
	global $pathtoroot;
	$this->Clear();
	$fullpath = $pathtoroot.'themes/'.$path;
	// get all templates from database
	$sql = 'SELECT FileId AS i,CONCAT(FilePath,"/",FileName) AS f FROM '.$this->SourceTable. ' WHERE ThemeId='.$this->ThemeId;
	$DBfiles=Array();
	if($rs = $this->adodbConnection->Execute($sql))
	{
	while(!$rs->EOF)
	{
	$DBfiles[$rs->fields['i']] = $fullpath.$rs->fields['f'];
	$rs->MoveNext();
	}
	$rs->Free();
	}
	// get all templates file from disk
	$HDDfiles = filelist($fullpath, NULL, "tpl");

	$missingFiles=array_diff($HDDfiles,$DBfiles);
	$orphanFiles=array_diff($DBfiles,$HDDfiles);
	if($orphanFiles)
	{
	$sql = 'DELETE FROM '.$this->SourceTable.' WHERE FileId IN('.join(',',array_keys($orphanFiles)).')';
	$this->adodbConnection->Execute($sql);
	}
	$l=strlen($fullpath);
	foreach($missingFiles as $file)
	$this->AddFile(substr(dirname($file),$l),basename($file),$this->ThemeId,0,'');
	}
	}

	RegisterPrefix("clsTheme","theme","kernel/include/theme.php");

	class clsTheme extends clsParsedItem
	{
	var $Files;
	var $FileCache;
	var $IdCache;
	var $ParseCacheDate;
	var $ParseCacheTimeout;

	function clsTheme($Id = NULL)
	{
	$this->clsParsedItem($Id);
	$this->tablename = GetTablePrefix()."Theme";
	$this->id_field = "ThemeId";
	$this->NoResourceId=1;
	$this->TagPrefix="theme";

	$this->Files = new clsThemeFileList($Id);
	$this->FileCache = array();
	$this->IdCache = array();
	$this->ParseCacheDate=array();
	$this->ParseCacheTimeout = array();

	if($Id)
	$this->LoadFromDatabase($Id);
	}

	function ThemeDirectory()
	{
	global $objConfig, $pathchar, $pathtoroot;

	$path = $pathtoroot."themes/".strtolower($this->Get("Name"));
	return $path;
	}

	function UpdateFileCacheData($id,$CacheDate)
	{
	$sql = "UPDATE ".GetTablePrefix()."ThemeFiles SET CacheDate=$CacheDate WHERE FileId=$id";
	$this->adodbConnection->Execute($sql);
	}

	function LoadFileCache()
	{
	if(!is_numeric($id=$this->Get("ThemeId")))return;
	$sql = "SELECT * FROM ".GetTablePrefix()."ThemeFiles WHERE ThemeId=".$id;
	$rs = $this->adodbConnection->Execute($sql);
	while($rs && ! $rs->EOF)
	{
	//$this->Files->AddItemFromArray($rs->fields,TRUE);
	$f = $rs->fields["FileName"];
	$t = $rs->fields["FilePath"];
	if(strlen($t))
	$t .= "/";
	$parts = pathinfo($f);
	$fname = substr($f,0,(strlen($parts["extension"])+1)*-1);
	// echo "Name: $fname<br>\n";
	$t .= $fname;

	$this->FileCache[$t] = $rs->fields["FileId"];
	$this->IdCache[$rs->fields["FileId"]] = $t;
	/*
	if($rs->fields["EnableCache"]) // no such field in this table (commented by Alex)
	{
	$this->ParseCacheDate[$rs->fields["FileId"]] = $rs->fields["CacheDate"];
	$this->ParseCacheTimeout[$rs->fields["FileId"]] = $rs->fields["CacheTimeout"];
	}
	*/
	if( defined('ADODB_EXTENSION') && constant('ADODB_EXTENSION') > 0 )
	adodb_movenext($rs);
	else
	$rs->MoveNext();
	}
	//echo "<PRE>"; print_r($this->IdCache); echo "</PRE>";
	}

	function GetTemplateById($FileId)
	{
	if(count($this->FileCache)==0)
	$this->LoadFileCache();
	$f = $this->IdCache[$FileId];

	return $f;
	}

	function GetTemplateId($t)
	{
	if( count($this->IdCache) == 0 ) $this->LoadFileCache();
	$f = isset( $this->FileCache[$t] ) ? $this->FileCache[$t] : '';
	return is_numeric($f) ? $f : $t;
	}

	function LoadFromDatabase($Id)
	{
	global $Errors;

	if(!isset($Id))
	{
	$Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromDatabase");
	return false;
	}
	$sql = sprintf("SELECT * FROM ".$this->tablename." WHERE ".$this->IdField()." = '%s'",$Id);
	$result = $this->adodbConnection->Execute($sql);
	if ($result === false)
	{
	$Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"LoadFromDatabase");
	return false;
	}

	$data = $result->fields;

	$this->SetFromArray($data);
	$this->Clean();
	$this->Files = new clsThemeFileList($Id);
	return true;
	}

	function GetFileList($where,$OrderBy)
	{
	global $objConfig, $pathchar;

	$this->Files->PerPageVar="";
	$this->Files->ThemeId = $this->Get("ThemeId");
	$this->Files->LoadFiles($this->Get("ThemeId"),$where,$OrderBy);
	}

	function VerifyTemplates($where = null,$OrderBy = null,$limit = null)
	{
	if(!is_object($this->Files))
	$this->Files = new clsThemeFileList($this->Get("ThemeId"));
	$this->Files->ThemeId = $this->Get("ThemeId");

	$this->Files->FindMissingFiles(strtolower($this->Get("Name")),$where,$OrderBy,$limit);
	}

	function EditTemplateContents($FileId,$Contents)
	{
	$this->Files->SetFileContents($FileId,$Contents);
	}

	function ReadTemplateContents($FileId)
	{
	return $this->Files->GetFileContents($FileId);
	}

	function CreateDirectory()
	{
	$dir = $this->ThemeDirectory();
	if(!is_dir($dir))
	mkdir($dir);
	if(is_dir($dir))
	{
	$fp = fopen($dir.'/index.tpl',"w");
	if($fp)
	{
	fwrite($fp,'');
	fclose($fp);
	// $this->Files->FindMissingFiles($this->Get('name'));
	/* $theme_id = $this->Get('ThemeId');
	$db_dir = '/'.strtolower($this->Get('Name'));
	$sql = 'INSERT INTO '.GetTablePrefix().'ThemeFiles
	(ThemeId, FileName, FilePath, Description, FileType) VALUES
	('.$theme_id.', "index.tpl", "'.$db_dir.'", "", 0)';
	$conn = &GetADODBConnection();
	$conn->Execute($sql);*/
	}
	}
	}

	function Delete()
	{
	$this->Files->DeleteAll();
	$dir = $this->ThemeDirectory();
	if(is_writable($dir)) {
	$files = filelist($dir);
	foreach ($files as $file) {
	@unlink($file);
	}
	@rmdir($dir);
	}
	parent::Delete();
	}

	function AdminIcon()
	{
	global $imagesURL;

	$file = $imagesURL."/itemicons/icon16_theme";
	if($this->Get("PrimaryTheme")==1)
	{
	$file .= "_primary.gif";
	}
	else
	{
	if($this->Get("Enabled")==0)
	{
	$file .= "_disabled";
	}
	$file .= ".gif";
	}
	return $file;
	}

	function ParseObject($element)
	{
	global $var_list_update, $objSession;

	$extra_attribs = ExtraAttributes($element->attributes);
	if(strtolower($element->name)==$this->TagPrefix)
	{
	$field = strtolower($element->attributes["_field"]);
	switch($field)
	{
	case "id":
	$ret = $this->Get("ThemeId");
	break;
	case "name": // was "nane"
	$ret = $this->Get("Name");
	break;
	case "description":
	$ret = $this->Get("Description");
	break;
	case "adminicon":
	$ret = $this->AdminIcon();
	break;
	case "directory":
	$ret = $this->ThemeDirectory();
	break;
	case "select_url":
	$var_list_update["t"] = "index";
	$ret = HREF_Wrapper('', Array('Action' => 'm_set_theme', 'ThemeId' => $this->Get('ThemeId') ) );
	break;
	case "selected":
	$ret = "";
	if($this->Get("Name")==$objSession->Get("Theme"))
	$ret = "SELECTED";
	break;
	default:
	$tag = $this->TagPrefix."_".$field;
	$ret = ""; $this->parsetag($tag);
	break;
	}
	}
	return $ret;
	}
	}

	class clsThemeList extends clsItemCollection
	{
	var $Page;
	var $PerPageVar;

	function clsThemeList($id=NULL)
	{
	$this->clsItemCollection();
	$this->classname="clsTheme";
	$this->SourceTable=GetTablePrefix()."Theme";
	$this->PerPageVar = "Perpage_Themes";
	$this->AdminSearchFields = array("Name","Description");
	}

	function LoadThemes($where='',$orderBy='')
	{
	global $objConfig;

	$this->Clear();
	$sql = "SELECT * FROM ".$this->SourceTable." ";
	if(trim($where))
	$sql .= "WHERE ".$where." ";
	if(trim($orderBy))
	$sql .= "ORDER BY $orderBy";

	$sql .= GetLimitSQL($this->Page,$objConfig->Get($this->PerPageVar));
	return $this->Query_Item($sql);
	}

	function AddTheme($Name,$Description,$Enabled,$Primary,$CacheTimeout=3600,$StylesheetId=1)
	{
	$t = new clsTheme();
	$t->tablename = $this->SourceTable;
	$t->Set(array("Name","Description","Enabled","PrimaryTheme","CacheTimeout",'StylesheetId'),
	array($Name,$Description,$Enabled,$Primary,$CacheTimeout,$StylesheetId));
	$t->Create();
	$t->Files->ThemeId=$t->Get("ThemeId");
	if($Primary==1)
	{
	$sql = "UPDATE ".$this->SourceTable." SET PrimaryTheme=0 WHERE ThemeId != ".$t->Get("ThemeId");
	$this->adodbConnection->Execute($sql);
	}
	return $t;
	}

	function EditTheme($ThemeId,$Name,$Description,$Enabled,$Primary, $CacheTimeout, $StylesheetId)
	{
	$t = $this->GetItem($ThemeId);
	$oldName = $t->Get("Name");
	if($oldName!=$Name)
	{
	$dir=dirname($t->ThemeDirectory());
	if(!rename($dir.'/'.$oldName,$dir.'/'.$Name))
	$Name=$oldName;
	}
	$t->Set(array("Name","Description","Enabled","PrimaryTheme","CacheTimeout", 'StylesheetId'),
	array($Name, $Description, $Enabled, $Primary, $CacheTimeout,$StylesheetId));
	$t->Dirty();
	$t->Update();
	if($Primary==1)
	{
	$sql = "UPDATE ".$this->SourceTable." SET PrimaryTheme=0 WHERE ThemeId!=$ThemeId";
	$this->adodbConnection->Execute($sql);
	}
	return $t;
	}

	function DeleteTheme($ThemeId)
	{
	$t = $this->GetItem($ThemeId);
	if (!$t->Get('PrimaryTheme'))
	{
	$t->Delete();
	return true;
	}
	else
	{
	return false;
	}
	}

	function SetPrimaryTheme($ThemeId)
	{
	$theme = $this->GetItem($ThemeId);
	$theme->Dirty();
	if($theme->Get("Enabled")==1)
	{
	$sql = "UPDATE ".$this->SourceTable." SET PrimaryTheme=0";
	$this->adodbConnection->Execute($sql);
	$theme->Set("PrimaryTheme","1");
	$theme->Update();
	}
	}

	function GetPrimaryTheme($field = 'ThemeId')
	{
	static $primary_theme = 0, $skip_quering = false;
	if ($skip_quering) return $primary_theme;

	if (!$primary_theme)
	{
	$sql = 'SELECT '.$field.' FROM '.$this->SourceTable.' WHERE PrimaryTheme = 1';
	$primary_theme = $this->adodbConnection->GetOne($sql);
	$skip_quering = true;
	}
	return $primary_theme;
	}

	function CreateMissingThemes($compile_css = false)
	{
	global $objConfig,$pathchar, $pathtoroot;

	$path = $pathtoroot."themes";

	$themes = array();
	$HDDThemes=Array();
	if ($dir = @opendir($path))
	{
	while (($file = readdir($dir)) !== false)
	{
	if($file !="." && $file !=".." && substr($file,0,1)!="_")
	{
	if(is_dir($path."/".$file)&&file_exists($path."/".$file.'/index.tpl'))
	{
	$file = strtolower($file);
	$themes[$file]=0;
	$HDDThemes[]=$file;
	}
	}
	}
	}
	closedir($dir);

	$sql = 'SELECT ThemeId AS i,Name AS n FROM '.$this->SourceTable;
	$DBThemes=Array();
	if($rs = $this->adodbConnection->Execute($sql))
	{
	while(!$rs->EOF)
	{
	$DBThemes[$rs->fields['i']] = $fullpath.$rs->fields['n'];
	$rs->MoveNext();
	}
	$rs->Free();
	}

	$missingThemes = array_udiff($HDDThemes, $DBThemes, 'stricmp');
	$orphanThemes = array_udiff($DBThemes, $HDDThemes, 'stricmp');

	if($orphanThemes)
	{
	$sql = 'DELETE FROM '.$this->SourceTable.' WHERE ThemeId IN('.join(',',array_keys($orphanThemes)).')';
	$this->adodbConnection->Execute($sql);
	$sql = 'DELETE FROM '.GetTablePrefix().'ThemeFiles WHERE ThemeId IN('.join(',',array_keys($orphanThemes)).')';
	$this->adodbConnection->Execute($sql);
	}

	// make stylesheet/theme hash
	$css_hash = Array();
	$css_rs = $this->adodbConnection->Execute('SELECT Name, StylesheetId FROM '.GetTablePrefix().'Stylesheets');
	- while(!$css_rs->EOF)
	+ while($css_rs && !$css_rs->EOF)
	{
	$css_hash[ strtolower($css_rs->fields['Name']) ] = $css_rs->fields['StylesheetId'];
	$css_rs->MoveNext();
	}

	if($compile_css)
	{
	$application =& kApplication::Instance();
	$css_table = $application->getUnitOption('css','TableName');
	$css_idfield = $application->getUnitOption('css','IDField');

	foreach($css_hash as $stylesheet_id)
	{
	$css_item =& $application->recallObject('css', null, Array('skip_autoload' => true) );
	$css_item->Load($stylesheet_id);
	$css_item->Compile();
	}
	$application->Done();
	}

	$this->Clear();
	foreach($missingThemes as $theme)
	{
	$t=$this->AddTheme($theme,"New Theme",0,0, 3600, getArrayValue($css_hash, $theme) );
	$t->Files->FindMissingFiles($t->Get('Name'));
	}
	}

	function CopyFromEditTable()
	{
	global $objSession;
	$GLOBALS['_CopyFromEditTable']=1;

	$edit_table = $objSession->GetEditTable($this->SourceTable);
	$idlist = array();
	$sql = "SELECT * FROM $edit_table";
	$this->Clear();
	$rs = $this->adodbConnection->Execute($sql);
	while($rs && !$rs->EOF)
	{
	$data = $rs->fields;
	$c = $this->AddItemFromArray($data);

	$c->Dirty();
	if($data["ThemeId"]>0)
	{
	$c->Update();
	}
	else
	{
	$c->UnsetIdField();
	$c->Create();
	$GLOBALS['m_var_list']['theme_id']=$c->Get('ThemeId');
	$c->CreateDirectory();
	}
	if($c->Get("PrimaryTheme"))
	{
	$this->SetPrimaryTheme($c->Get("ThemeId"));
	}
	$rs->MoveNext();
	}
	$this->adodbConnection->Execute($sql);
	unset($GLOBALS['_CopyFromEditTable']);
	}

	function PurgeEditTable()
	{
	global $objSession;

	$edit_table = $objSession->GetEditTable($this->SourceTable);
	$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table");
	}


	}
	?>

	Property changes on: trunk/kernel/include/theme.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.22
	\ No newline at end of property
	+1.23
	\ No newline at end of property
	Index: trunk/kernel/include/usersession.php
	===================================================================
	--- trunk/kernel/include/usersession.php (revision 7412)
	+++ trunk/kernel/include/usersession.php (revision 7413)
	@@ -1,1264 +1,1264 @@
	<?php

	class clsUserSession
	{
	//Common DB operation class variables
	var $m_dirtyFieldsMap = array();
	//Identity
	var $m_SessionKey;
	var $m_CurrentTempKey;
	var $m_PrevTempKey;
	//Required attributes
	var $m_LastAccessed;
	var $m_PortalUserId;
	var $m_Language;
	var $m_Theme;
	var $m_GroupId;
	var $adodbConnection;
	var $m_Errors;
	var $m_GroupList;
	var $PermCache;
	var $SysPermCache;
	var $PermCacheGroups;
	var $CurrentUser;
	var $UseTempKeys;
	var $AdminSearchFields;

	function clsUserSession($id=NULL, $TempKeys=FALSE)
	{
	global $objConfig, $objLanguages, $objThemes, $m_var_list, $FrontEnd;

	$this->m_Errors = new clsErrorManager();
	$this->adodbConnection = &GetADODBConnection();

	$this->PermCache = array();
	$this->PermCacheGroups = '';
	$this->UseTempKeys = $TempKeys;
	$this->AdminSearchFields = array("UserName", "GroupName", "us.IpAddress");

	if( GetVar('help_usage') == 'install' ) return;

	if(!$this->UseTempKeys \|\| strlen($id)==0)
	{
	//echo "with cookies";
	if( !isset($_SERVER['HTTP_REFERER']) ) $_SERVER['HTTP_REFERER'] = '';
	if(!isset($_GET['destform'])) $_GET['destform'] = null;
	if(!isset($_GET['continue_sess'])) $_GET['continue_sess'] = null;

	// strstr($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'].$objConfig->Get("Site_Path")) \|\| defined(IS_PO...)
	// && ( (defined('IS_POPUP') && IS_POPUP) \|\| $_GET['destform'] == 'popup' \|\| $_GET['continue_sess'] == 1)
	if( strlen($id) )
	{
	$this->Set("SessionKey",$id);
	return $this->LoadFromDatabase($id);
	}
	else
	{
	$this->Set("PortalUserId", 0);
	$this->Set("Language", $objLanguages->GetPrimary());
	$ThemeId = $m_var_list["theme"];
	$this->SetThemeName($ThemeId);
	//$this->Set("Theme", $objConfig->Get("Default_Theme"));
	$this->Set("GroupList",0);
	$this->Set("SessionKey","");
	if ($FrontEnd) {
	$this->Set("GroupList",$objConfig->Get("User_GuestGroup").','.$objConfig->Get('User_LoggedInGroup') );
	}
	}
	}
	else
	{
	//echo "without cookies";
	return $this->LoadFromTempKey($id);
	}
	}

	function AdminSearchWhereClause($SearchList)
	{
	$sql = "";
	if( !is_array($SearchList) ) $SearchList = explode(",",$SearchList);

	// remove empty elements
	$SearchListTmp=Array();
	for($f = 0; $f < count($SearchList); $f++)
	if($SearchList[$f])
	$SearchListTmp[]=$SearchList[$f];
	$SearchList=$SearchListTmp;

	if( !count($SearchList) \|\| !count($this->AdminSearchFields) ) return '';

	for($f = 0; $f < count($SearchList); $f++)
	{
	$value = $SearchList[$f];
	if( strlen($value) )
	{
	$inner_sql = "";
	for($i = 0; $i < count($this->AdminSearchFields); $i++)
	{
	$field = $this->AdminSearchFields[$i];
	if( strlen( trim($value) ) )
	{
	if( strlen($inner_sql) ) $inner_sql .= " OR ";

	//if (!stristr($value, "Guest")) {
	$inner_sql .= $field." LIKE '%".$value."%'";
	//}
	//else {
	// $inner_sql .= $field." IS NULL";
	//}
	}
	}
	if( strlen($inner_sql) )
	{
	$sql .= '('.$inner_sql.') ';
	if($f < count($SearchList) - 1) $sql .= " AND ";
	}
	}
	}
	return $sql;
	}

	function CopyToNewSession()
	{
	$OldKey = $this->GetSessionKey();
	$this->GetNewSession();
	if($OldKey != $this->GetSessionKey())
	{
	$this->Set("PortalUserId",$this->Get("PortalUserId"));
	$this->Set("GroupId",$this->Get("GroupId"));
	$this->Set("GroupList",$this->Get("GroupList"));
	$this->Set("Language",$this->Get("Language"));
	$this->Set("tz",$this->Get("tz"));
	$this->Set("LastAccessed",adodb_date("U"));
	$this->Update();
	}
	}

	function Get($name)
	{
	$var = "m_" . $name;
	return isset($this->$var) ? $this->$var : '';
	}

	function Set($name, $value)
	{
	if (is_array($name))
	{
	for ($i=0; $i<sizeof($name); $i++)
	{ $var = "m_" . $name[$i];
	$this->$var = $value[$i];
	$this->m_dirtyFieldsMap[$name[$i]] = $value[$i];
	}
	}
	else
	{
	$var = "m_" . $name;
	$this->$var = $value;
	$this->m_dirtyFieldsMap[$name] = $value;
	//echo "Set: $var = $value <br>\n";
	}
	}

	function Validate()
	{
	$dataValid = true;
	if(!isset($this->m_LastAccessed))
	{
	$this->m_Errors->AddError("error.fieldIsRequired",'LastAccessed',"","",get_class($this),"Validate");
	$dataValid = false;
	}

	if(!isset($this->m_PortalUserId))
	{
	$this->m_Errors->AddError("error.fieldIsRequired",'PortalUserId',"","",get_class($this),"Validate");
	$dataValid = false;
	}

	if(!isset($this->m_Language))
	{
	$this->m_Errors->AddError("error.fieldIsRequired",'Language',"","",get_class($this),"Validate");
	$dataValid = false;
	}

	if(!isset($this->m_Theme))
	{
	$this->m_Errors->AddError("error.fieldIsRequired",'Theme',"","",get_class($this),"Validate");
	$dataValid = false;
	}

	return $dataValid;
	}

	function Delete()
	{
	if(!isset($this->m_SessionKey))
	{
	$this->m_Errors->AddError("error.AppError",NULL,'Internal error: Delete requires set id',"",get_class($this),"Delete");
	return false;
	}
	//Delete associated adata first
	$sql = sprintf("DELETE FROM ".GetTablePrefix()."SessionData WHERE SessionKey = '%s'", $this->Get("SessionKey"));
	$this->adodbConnection->Execute($sql);
	$sql = sprintf("DROP TABLE IF EXISTS %s%s_search",GetTablePrefix(), $this->Get("SessionKey"));
	$this->adodbConnection->Execute($sql);
	$sql = sprintf("DELETE FROM ".GetTablePrefix()."UserSession WHERE SessionKey = '%s'", $this->Get("SessionKey"));
	$this->adodbConnection->Execute($sql);
	if ($this->adodbConnection->Execute($sql) === false)
	{
	$this->m_Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"Delete");
	return false;
	}
	$this->Set("SessionKey","");
	$this->Set("SessionDataLoaded",false);
	return true;
	}

	function Update()
	{
	global $objConfig;

	//$this->Set("LastAccessed",adodb_date("U"));
	$this->Set("IpAddress",$_SERVER["REMOTE_ADDR"]);
	if(!isset($this->m_SessionKey))
	{
	$this->m_Errors->AddError("error.AppError",NULL,'Internal error: Update requires set id',"",get_class($this),"Update");
	return false;
	}
	if(!is_numeric($this->Get("PortalUserId")))
	{
	$this->Set("PortalUserId",0);
	}
	if(!strlen($this->Get("GroupList")))
	{
	$this->Set("GroupList",$objConfig->Get("User_GuestGroup"));
	}
	if(count($this->m_dirtyFieldsMap) == 0)
	return true;
	$sql = "UPDATE ".GetTablePrefix()."UserSession SET ";
	$first = 1;
	foreach ($this->m_dirtyFieldsMap as $key => $value)
	{
	if($first)
	{
	$sql = sprintf("%s %s=%s",$sql,$key,$this->adodbConnection->qstr($value));
	$first = 0;
	}
	else
	{
	$sql = sprintf("%s, %s=%s",$sql,$key,$this->adodbConnection->qstr($value));
	}
	}
	$sql = sprintf("%s WHERE SessionKey = '%s'",$sql, $this->Get("SessionKey"));
	//echo $sql;
	if ($this->adodbConnection->Execute($sql) === false)
	{
	$this->m_Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"Update");
	return false;
	}
	return true;
	}

	function Create()
	{
	global $objConfig;

	$this->Set("LastAccessed", adodb_mktime());
	if(!is_numeric($this->Get("PortalUserId")))
	{
	$this->Set("PortalUserId",0);
	}
	if(!strlen($this->Get("GroupList")))
	{
	$this->Set("GroupList",$objConfig->Get("User_GuestGroup"));
	}
	$sql = "INSERT INTO ".GetTablePrefix()."UserSession (";
	$first = 1;
	foreach ($this->m_dirtyFieldsMap as $key => $value)
	{
	if($first)
	{
	$sql = sprintf("%s %s",$sql,$key);
	$first = 0;
	}
	else
	{
	$sql = sprintf("%s, %s",$sql,$key);
	}
	}
	$sql = sprintf('%s ) VALUES (',$sql);
	$first = 1;
	foreach ($this->m_dirtyFieldsMap as $key => $value)
	{
	if($first)
	{
	$sql = sprintf("%s %s",$sql,$this->adodbConnection->qstr($value));
	$first = 0;
	}
	else
	{
	$sql = sprintf("%s, %s",$sql,$this->adodbConnection->qstr($value));
	}
	}
	$sql = sprintf('%s)',$sql);
	//echo $sql."<br>\n";
	if ($this->adodbConnection->Execute($sql) === false)
	{
	$this->m_Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"Create");
	return false;
	}
	return true;
	}

	function LoadFromTempKey($id=NULL)
	{
	global $objLanguages, $objConfig,$m_var_list;
	$referer = $_SERVER["HTTP_REFERER"];
	//echo "Referer: $referer <br>\n";
	if(strlen($referer) && strpos($referer,"env="))
	{
	$keystart = strpos($referer,"env=")+4;
	$referer = substr($referer,$keystart);
	$keyend = strpos($referer,"-");
	$LastKey = substr($referer,0,$keyend);
	if(strlen($LastKey))
	{
	$sql = "SELECT * FROM ".GetTablePrefix()."UserSession WHERE (CurrentTempKey = '$id' OR PrevTempKey='$id' OR CurrentTempKey='$LastKey' OR PrevTempKey='$LastKey') ";
	}
	else
	$sql = "SELECT * FROM ".GetTablePrefix()."UserSession WHERE CurrentTempKey = '$id' AND PrevTempKey IS NULL";
	}
	else
	$sql = "SELECT * FROM ".GetTablePrefix()."UserSession WHERE CurrentTempKey = '$id' AND PrevTempKey IS NULL";

	$result = $this->adodbConnection->Execute($sql);
	if ($result === false)
	{
	$this->m_Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"LoadFromDatabase");
	return false;
	}
	$data = $result->fields;
	if (is_array($data))
	{
	foreach($data as $field => $value)
	{
	$mname = "m_" . $field;
	$this->$mname = $data[$field];
	}

	if($this->Get("CurrentTempKey")) {
	$this->Set("PrevTempKey",$this->Get("CurrentTempKey"));
	$this->UseTempKeys=TRUE;
	}

	if (!$this->Get("CurrentTempKey") \|\| !strstr($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST'].$objConfig->Get("Site_Path"))) {
	//$this->Set("PrevTempKey",$this->Get("CurrentTempKey"));
	//$this->Set("CurrentTempKey",$this->GetUniqueKey());
	$this->UseTempKeys=FALSE;
	$this->Set("PortalUserId", 0);
	$this->Set("Language", $objLanguages->GetPrimary());
	$ThemeId = $m_var_list["theme"];
	$this->SetThemeName($ThemeId);
	//$this->Set("Theme", $objConfig->Get("Default_Theme"));
	$this->Set("GroupList",0);
	$this->Set("SessionKey","");
	$this->Set("GroupList",$objConfig->Get("User_GuestGroup"));
	}
	//$this->UseTempKeys=TRUE;
	$this->Update();
	return true;
	}
	else
	{
	$this->Set("PortalUserId", 0);
	$this->Set("Language", $objLanguages->GetPrimary());
	$ThemeId = $m_var_list["theme"];
	$this->SetThemeName($ThemeId);
	//$this->Set("Theme", $objConfig->Get("Default_Theme"));
	$this->Set("GroupList",0);
	$this->Set("SessionKey","");
	$this->Set("GroupList",$objConfig->Get("User_GuestGroup"));
	$this->Set("CurrentTempKey",$this->GetUniqueKey());
	return false;
	}
	}

	function LoadFromDatabase($id)
	{
	if(!isset($id))
	{
	$this->m_Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromDatabase");
	return false;
	}
	$sql = sprintf("SELECT * FROM ".GetTablePrefix()."UserSession WHERE SessionKey = '%s'",$id);

	$result = $this->adodbConnection->Execute($sql);
	if ($result === false)
	{
	$this->m_Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"LoadFromDatabase");
	return false;
	}
	$data = $result->fields;
	if (is_array($data))
	{
	foreach($data as $field => $value)
	{
	$mname = "m_" . $field;
	$this->$mname = $data[$field];
	}
	return true;
	}
	else
	{
	return false;
	}
	}

	function Login($userLogin, $userPassword)
	{
	global $expired, $objConfig, $FrontEnd;

	if($userLogin == "root")
	{
	// logging in "root" (admin only)
	$rootpass = $objConfig->Get("RootPass");
	if($rootpass!=$userPassword)
	{
	return false;
	}
	else
	{
	if(!strlen($this->GetSessionKey()))
	$this->GetNewSession();
	$this->Set("PortalUserId",-1);
	$this->Update();

	/*$db =& $this->adodbConnection;
	$sql = 'UPDATE '.GetTablePrefix().'Visits SET PortalUserId = %s WHERE VisitId = %s';
	$db->Execute( sprintf($sql, $this->Get('PortalUserId'), $this->GetVariable('visit_id') ) );*/

	return true;
	}
	}
	else
	{
	// logging in any user (admin & front)
	$db =& $this->adodbConnection;
	$prefix = GetTablePrefix();

	//$key_clause = $objConfig->Get('Email_As_Login') ? 'pu.Email = %1$s' : 'pu.Login = %1$s';
	$key_clause = 'pu.Email = %1$s OR pu.Login = %1$s';

	$sql = 'SELECT *, MD5(pu.Password) AS md5pw
	FROM '.$prefix.'PortalUser pu
	LEFT JOIN '.$prefix.'UserGroup ug USING (PortalUserId)
	LEFT JOIN '.$prefix.'PortalGroup pg ON ug.GroupId = pg.GroupId
	WHERE ('.$key_clause.') AND (pu.Status = 1) AND (pu.Password = %2$s OR MD5(pu.Password) = %2$s OR pu.Password = MD5(%2$s) ) AND
	( (ug.MembershipExpires IS NULL) OR ( ug.MembershipExpires >= UNIX_TIMESTAMP() ) )
	ORDER BY ug.PrimaryGroup DESC, pg.Personal DESC';

	$result = $db->Execute( sprintf($sql, $db->qstr($userLogin), $db->qstr($userPassword) ) );

	if($result === false)
	{
	$this->m_Errors->AddError('error.DatabaseError',NULL,$this->adodbConnection->ErrorMsg(),'',get_class($this),'Login');
	return false;
	}

	if($result->EOF) return -1; // no any user with username & pass specified
	}

	if( !strlen($this->GetSessionKey()) ) $this->GetNewSession();

	$this->Set("PortalUserId", $result->fields["PortalUserId"]);

	if($FrontEnd)
	{
	$application =& kApplication::Instance();
	$application->setVisitField('PortalUserId', $this->Get('PortalUserId') );
	$application->SetVar('u.current_id', $this->Get('PortalUserId'));
	}

	// unset($this->CurrentUser);
	$this->CurrentUser = null;
	if( strlen($result->fields['tz']) > 0 ) $this->Set('tz',$result->fields['tz']);
	$PrimaryGroup = 0;
	$PersonalGroup = 0;
	$GroupList = Array();

	while($result && !$result->EOF)
	{
	$skipadd=0;
	$g = $result->fields["GroupId"];

	if($result->fields["PrimaryGroup"]==1)
	{
	$PrimaryGroup = $g;
	$skipadd=1;
	}
	if($result->fields["Personal"]==1)
	{
	$PersonalGroup=$g;
	$skipadd=0;
	}
	if(!$skipadd)
	$GroupList[] = $g;
	$result->MoveNext();
	}

	if($PrimaryGroup) array_unshift($GroupList, $PrimaryGroup);
	if ($FrontEnd) array_push($GroupList, $objConfig->Get('User_LoggedInGroup') );

	$extra_groups = implode(',', $GroupList);

	$this->SetVariable('UserGroups', $extra_groups);
	$this->SetVariable('user_id', $this->Get('PortalUserId'));

	$this->Set('GroupId', $PersonalGroup ? $PersonalGroup : $PrimaryGroup);

	$this->Set('GroupList', $extra_groups);
	$this->SetVariable('UserGroups', $this->Get('GroupList') );


	$app = kApplication::Instance();
	$kSession = $app->recallObject('Session');
	$kSession->SetField('GroupList', $extra_groups);
	$app->StoreVar('UserGroups', $this->Get('GroupList') );
	$app->setVisitField('PortalUserId', $this->Get('PortalUserId') );


	$this->Set('LastAccessed', adodb_date('U') );
	$this_login = $this->GetPersistantVariable("ThisLogin");
	$this->SetPersistantVariable("LastLogin", $this_login);
	$this->SetPersistantVariable("ThisLogin", adodb_mktime());
	$this->ResetSysPermCache();
	$this->PermCache = array();
	$this->Update();

	if($userLogin != 'root' && $FrontEnd)
	{
	if( ! $this->HasSystemPermission('LOGIN') )
	{
	$this->Logout();
	return -2; // no perm login
	}
	}

	return true; // login ok
	}

	function Logout()
	{
	global $objConfig, $FrontEnd;

	$this->Set("PortalUserId", 0); // not logged-in
	$this->Set('LastAccessed',0); // session become expired
	$this->Set("GroupId", $objConfig->Get("User_GuestGroup"));
	#$this->SetPersistantVariable("LastLogin", adodb_mktime());

	$group_list = $FrontEnd ? $objConfig->Get('User_GuestGroup').','.$objConfig->Get('User_LoggedInGroup') : '';
	$this->Set("GroupList", $group_list);
	$this->SetVariable('UserGroups', $group_list );
	$this->SetVariable('user_id', -2);

	if( class_exists('kApplication') )
	{
	$app = kApplication::Instance();
	$kSession = $app->recallObject('Session');
	$kSession->SetField('GroupList', $group_list);
	$app->StoreVar('UserGroups', $group_list );
	}

	$this->Set("IpAddress",$_SERVER['REMOTE_ADDR']);

	$this->DeleteSessionData($this->GetSessionKey());
	$this->Update();
	//$this->Delete();
	$this->ResetSysPermCache();
	$this->PermCache = array();

	if($FrontEnd && class_exists('kApplication') )
	{
	$app =& kApplication::Instance();
	$app->Redirect();
	}
	}

	function SetVariable($variableName, $variableValue)
	{
	global $objConfig, $FrontEnd;

	$objConfig->Set($variableName,$variableValue,2);
	$variableValue = addslashes($variableValue);

	//if(!(int)$FrontEnd==1)
	//{
	$db =& $this->adodbConnection;
	$sessionkey = $this->GetSessionKey();
	$sql = 'REPLACE INTO '.GetTablePrefix().'SessionData (SessionKey,VariableName,VariableValue) VALUES (%s,%s,%s)';
	$db->Execute( sprintf($sql, $db->qstr($sessionkey), $db->qstr($variableName), $db->qstr($variableValue) ) );

	if( class_exists('kApplication') )
	{
	// echo 'var stored ['.$variableName.'] = ['.$variableValue.']<br>';
	$application =& kApplication::Instance();
	$application->StoreVar($variableName, $variableValue);
	}

	// echo "<BR>UPDATE: $sql<BR>";
	//}
	}

	function SetPersistantVariable($variableName, $variableValue)
	{
	global $objConfig, $objUsers;

	$userid = (int)$this->Get("PortalUserId");

	if($userid > 0)
	{
	if(!is_object($this->CurrentUser))
	{
	$this->CurrentUser = $objUsers->GetItem($userid);
	}
	if(!$this->CurrentUser->VarsLoaded)
	{
	$this->CurrentUser->LoadPersistantVars();
	}
	//echo "setting current user' $variableName, $variableValue<br>";
	$this->CurrentUser->SetPersistantVariable($variableName, $variableValue);
	//$this->SetVariable($variableName,$variableValue);
	}
	else
	{
	$this->SetVariable($variableName,$variableValue);
	}
	}

	function GetPersistantVariable($variableName)
	{
	global $objConfig, $objUsers;

	$UserID = $this->Get("PortalUserId");
	if(is_numeric($UserID))
	{
	if(!is_object($this->CurrentUser))
	{
	$this->CurrentUser = $objUsers->GetItem($UserID);
	}
	if(!$this->CurrentUser->VarsLoaded)
	{
	$this->CurrentUser->LoadPersistantVars();
	}
	$val = $this->CurrentUser->GetPersistantVariable($variableName);
	//echo "Persistant Val for $variableName: $val<br>";
	}
	if(!strlen($val))
	$val = $objConfig->Get($variableName);
	return $val;
	}

	function GetVariable($variableName)
	{
	global $objConfig;

	return $objConfig->Get($variableName);
	}

	function LoadSessionData()
	{
	global $objConfig, $objUsers;

	if(is_numeric($this->Get("PortalUserId")))
	{
	$sql = "SELECT VariableName, VariableValue FROM ".GetTablePrefix()."SessionData where SessionKey='" . $this->Get("SessionKey") . "'";
	//echo $sql."<br>\n";
	$result = $this->adodbConnection->Execute($sql);

	if( basename($_SERVER['PHP_SELF']) != 'edit_config.php' )
	{
	while ($result && !$result->EOF)
	{
	$data = $result->fields;
	//echo "<PRE>"; print_r($data); echo "</PRE>";
	$objConfig->Set($data["VariableName"],$data["VariableValue"],FALSE);
	$result->MoveNext();
	}
	}

	if(!is_object($this->CurrentUser))
	{
	$this->CurrentUser = $objUsers->GetItem($this->Get("PortalUserId"));
	}
	if(!$this->CurrentUser->VarsLoaded)
	{
	$this->CurrentUser->LoadPersistantVars();
	}
	}
	if((int)$this->GetPersistantVariable("Language"))
	$this->Set("Language",$objConfig->Get("Language"));
	$this->DeleteExpiredSessions();
	return true;
	}

	function DeleteSessionData($key)
	{
	$sql = "DELETE FROM ".GetTablePrefix()."SessionData WHERE SessionKey='$key'";
	$this->adodbConnection->Execute($sql);
	}

	function SaveSessionData()
	{
	global $objConfig;

	//echo "Saving Session Data..<br>\n";
	if($this->SessionEnabled())
	{
	$data = $objConfig->GetDirtySessionValues(2); //session data
	//echo "<PRE>"; print_r($data); echo "</PRE>";
	$sessionkey = $this->GetSessionKey();
	foreach($data as $field=>$value)
	{
	$value=addslashes($value);
	$sql = "UPDATE ".GetTablePrefix()."SessionData SET VariableValue='$value' WHERE VariableName='$field' AND SessionKey='$sessionkey'";
	$this->adodbConnection->Execute($sql);
	//echo $sql."<br>\n";

	if($this->adodbConnection->Affected_Rows()==0)
	{
	$sql = "INSERT INTO ".GetTablePrefix()."SessionData (VariableName,VariableValue,SessionKey) VALUES ('$field','$value','$sessionkey')";
	$this->adodbConnection->Execute($sql);
	}
	// echo $sql."<br>\n";
	}
	}
	}

	function DeleteEditTables()
	{
	$tables = $this->adodbConnection->MetaTables();
	$mask = '/'.GetTablePrefix().'ses_(.)_edit_(.)/';
	$sql='SELECT COUNT(*) FROM '.GetTablePrefix().'UserSession WHERE SessionKey = \'%s\'';
	foreach($tables as $table)
	{
	if( preg_match($mask,$table,$rets) )
	{
	$sid=$rets[1];
	$is_alive = $this->adodbConnection->GetOne( sprintf($sql,$sid) );
	if(!$is_alive) @$this->adodbConnection->Execute('DROP TABLE IF EXISTS '.$table);
	}
	}
	}

	function DeleteExpiredSessions()
	{
	global $objConfig;

	$cutoff = adodb_mktime()-$objConfig->Get("SessionTimeout");
	$thiskey = $this->GetSessionKey();
	$sql = "SELECT SessionKey from ".GetTablePrefix()."UserSession WHERE LastAccessed<$cutoff AND SessionKey != '$thiskey'";
	$result = $this->adodbConnection->Execute($sql);
	$keys = array();
	while ($result && !$result->EOF)
	{
	$keys[] = "SessionKey='" . $result->fields["SessionKey"] . "'";
	$result->MoveNext();
	}
	if(count($keys)>0)
	{
	$keywhere = implode(" OR ", $keys);
	$sql = "DELETE FROM ".GetTablePrefix()."SessionData WHERE $keywhere";
	//echo $sql;
	$this->adodbConnection->Execute($sql);
	$this->adodbConnection->Execute("DELETE FROM ".GetTablePrefix()."UserSession WHERE LastAccessed<$cutoff");
	$this->DeleteEditTables();
	}
	}

	function SetSysPermCache()
	{
	unset($this->SysPermCache);
	$GroupList = $this->Get('GroupList');

	if ($GroupList && $GroupList != '0') {
	$this->SysPermCache = Array();
	$sql = 'SELECT *
	FROM '.GetTablePrefix().'Permissions
	WHERE Type = 1 AND GroupId IN ('.$GroupList.')'; // AND PermissionValue = 1';

	$rs = $this->adodbConnection->Execute($sql);

	$PermList = Array();
	- while (!$rs->EOF) {
	+ while ($rs && !$rs->EOF) {
	$this->SysPermCache[ $rs->fields['Permission'] ] = $rs->fields['PermissionValue'];
	$PermList[] = $rs->fields['Permission'];
	$rs->MoveNext();
	}

	if ($PermList) {
	$this->SetVariable('SysPerm', implode(',', $PermList));
	}
	}
	}

	/**
	* Fills system permission cache in session (memory only, not db)
	*
	*/
	function GetSysPermCache()
	{
	$perms = trim($this->GetVariable('SysPerm'));
	if (!$perms) {
	$this->SetSysPermCache();
	}
	else {
	$p = explode(',', $perms);
	$this->SysPermCache = Array();
	for($i = 0; $i < count($p); $i++)
	{
	$n = $p[$i];
	$this->SysPermCache[$n] = 1;
	}
	}
	}

	/**
	* Allows to detect if system permissions are loaded
	*
	* @return bool
	*/
	function SysPermCacheLoaded()
	{
	return isset($this->SysPermCache);
	}

	/**
	* Resets system permission cache
	*
	*/
	function ResetSysPermCache()
	{
	$this->SetVariable('SysPerm', '');
	unset($this->SysPermCache);
	}

	function HasSystemPermission($PermissionName)
	{
	global $objGroups;

	// "root" is always allowed to login to admin
	if ($this->Get('PortalUserId') == -1 && ($PermissionName == 'ADMIN' \|\| $PermissionName == 'LOGIN') ) {
	return true;
	}

	// cut last comma (just in case in-portal made a mistake before)
	$GroupList = $this->Get('GroupList');
	if (substr($GroupList, -1) == ',') {
	$GroupList = substr($GroupList, 0, -1);
	$this->Set('GroupList', $GroupList);
	}

	// if loaded permissions are from other group list, then current (e.g. user is become logged-in during script run)
	if ($this->Get('GroupList') != $this->PermCacheGroups) {
	$this->ResetSysPermCache();
	}

	// load system permission cache if not already loaded
	if (!$this->SysPermCacheLoaded()) {
	$this->GetSysPermCache();
	$this->PermCacheGroups = $this->Get('GroupList');
	}
	//echo "SysPerm $PermissionName: [". $this->SysPermCache[$PermissionName]."]<br>\n";
	return isset($this->SysPermCache[$PermissionName]) ? $this->SysPermCache[$PermissionName] == 1 : false;
	}

	function HasCatPermission($PermissionName,$CatId=NULL)
	{
	global $objCatList, $objUsers;

	$PermSet =FALSE;
	$Value = 0;
	if($this->Get("PortalUserId")==-1)
	return TRUE;
	if(!strlen($PermissionName))
	return FALSE;
	$GroupList = $this->Get("GroupList");
	if(substr($GroupList,-1)==",")
	{
	$GroupList = substr($GroupList,0,-1);
	$this->Set("GroupList",$GroupList);
	}
	if(!strlen($this->Get("SessionKey")))
	$this->Set("GroupId",0);
	if(strlen(trim($GroupList)))
	{
	if(strlen($this->Get("GroupId")))
	{
	$GroupList = $this->Get("GroupId").",".$GroupList;
	}
	}
	else
	{
	$GroupList = $this->Get("GroupId");
	}

	if($CatId == NULL)
	{
	$CatId = $objCatList->CurrentCategoryID();
	}

	$Cat = &$objCatList->GetCategory($CatId);

	$Value="";
	for($p=0;$p<count($this->PermCache);$p++)
	{
	$pItem = $this->PermCache[$p];
	if($pItem["perm"]==$PermissionName && $pItem["cat"]==$CatId)
	{
	$Value=$pItem["value"];
	break;
	}
	}
	if(is_object($Cat) && !is_numeric($Value))
	{
	$Value = 0;
	$CatList = $Cat->Get("ParentPath");
	$CatList = substr($CatList,1,-1);
	$CatList = str_replace("\|",",",$CatList);
	if(strlen($CatList))
	{
	$CatList ="0,".$CatList;
	}
	else
	$CatList = "0";
	$sql = "SELECT * FROM ".GetTablePrefix()."Permissions WHERE Permission LIKE '$PermissionName' AND CatId IN ($CatList) AND GroupId IN ($GroupList)";
	// echo $sql."<br>\n";
	$rs = $this->adodbConnection->Execute($sql);
	$PermValue = array();
	while($rs && !$rs->EOF)
	{
	$index = $rs->fields["CatId"];
	if(!is_numeric($PermValue[$index]) \|\| $rs->fields["PermissionValue"]) {
	// remember permission value of not set or allowed
	$PermValue[$index] = $rs->fields["PermissionValue"];
	}
	$rs->MoveNext();
	}
	$cats = array_reverse(explode(",",$CatList));
	for($c=0;$c<count($cats);$c++)
	{
	$index = $cats[$c];
	if( isset($PermValue[$index]) && is_numeric($PermValue[$index]) )
	{
	$Value = $PermValue[$index];
	break;
	}
	}
	$perm = array();
	$perm["perm"] = $PermissionName;
	$perm["cat"] = $CatId;
	$perm["value"] = $Value;
	array_push($this->PermCache, $perm);
	}
	//echo $GroupList." Has Permission $PermissionName = $Value<br>\n";
	return $Value;
	}

	function HasCatPermInList($PermList,$CatId=NULL, $System=FALSE)
	{
	$value = 0;
	if(strlen($PermList))
	{
	$plist = explode(",",$PermList);
	$value=0;
	for($p=0;$p<count($plist);$p++)
	{
	if($this->HasCatPermission($plist[$p]))
	{
	$value = 1;
	break;
	}
	else
	{
	if($System)
	{
	if($this->HasSystemPermission($plist[$p]))
	{
	$value = 1;
	break;
	}
	}
	}
	}
	}
	return $value;
	}

	function GetACLClause()
	{
	$GroupList = $this->Get("GroupList");
	if(strlen($GroupList))
	$Groups = explode(",",$GroupList);
	$acl_where = "";
	if(@count($Groups)>0 && is_array($Groups))
	{
	$acl_where = array();
	for($i=0;$i<count($Groups);$i++)
	{
	$g = $Groups[$i];
	if(strlen($g)>0)
	$acl_where[] = "FIND_IN_SET($g,acl) ";
	}
	if(count($acl_where))
	{
	$acl_where = "(".implode(" OR ",$acl_where).")";
	}
	else {
	$acl_where = "FIND_IN_SET(0,acl)";
	}
	}
	else {
	$acl_where = "FIND_IN_SET(0,acl)";
	}
	return $acl_where;
	}

	function GetEditTable($base_table)
	{
	$prefix = GetTablePrefix();
	if(strlen($prefix))
	{
	if(substr($base_table,0,strlen($prefix))!=$prefix)
	$base_table = $prefix.$base_table;
	}
	$table = $prefix."ses_".$this->GetSessionKey()."_edit_".$base_table;
	//echo "Table: $table <br>\n";
	return $table;
	}

	function GetSessionTable($base_table,$name)
	{
	$prefix = GetTablePrefix();
	if(strlen($prefix))
	{
	if(substr($base_table,0,strlen($prefix))!=$prefix)
	$base_table = $prefix.$base_table;
	}
	$table = $prefix."ses_".$this->GetSessionKey()."_".$name.$base_table;
	//echo "Table: $table <br>\n";
	return $table;
	}

	function GetSearchTable($base_table="")
	{
	$prefix = GetTablePrefix();
	if(strlen($base_table))
	{
	if(strlen($prefix))
	{
	if(substr($base_table,0,strlen($prefix))!=$prefix)
	$base_table = $prefix.$base_table;
	}
	$table = $prefix."ses_".$this->GetSessionKey()."_search_".$base_table;
	}
	else
	$table = $this->GetSessionTable('Search',''); //$prefix."ses_".$this->GetSessionKey()."_search";
	return $table;
	}

	function GetTotalSessions()
	{
	# $time = adodb_mktime() - 900;
	$sql = "SELECT count(*) as SesCount FROM ".GetTablePrefix()."UserSession";
	$result = $this->adodbConnection->Execute($sql);
	if ($result === false)
	{
	$this->m_Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"GetTotalSessions");
	return false;
	}
	return $result->fields["SesCount"];
	}

	function Query_UserSession($whereClause,$orderByClause)
	{
	$resultSet = array();
	$sql = "SELECT ".GetTablePrefix()."* FROM ".GetTablePrefix()."UserSession ";
	if(isset($whereClause))
	$sql = sprintf('%s WHERE %s',$sql,$whereClause);
	if(isset($orderByClause))
	$sql = sprintf('%s ORDER BY %s',$sql,$orderByClause);
	$result = $this->adodbConnection->Execute($sql);
	if ($result === false)
	{
	$this->m_Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"Query_UserSession");
	return false;
	}
	while (!$result->EOF)
	{
	$item = new clsUserSession(NULL);
	$item->Set("SessionKey",$result->fields["SessionKey"]);
	$item->Set("LastAccessed", $result->fields["LastAccessed"]);
	$item->Set("PortalUserId", $result->fields["PortalUserId"]);
	$item->Set("Language", $result->fields["Language"]);
	$item->Set("Theme" , $result->fields["Theme"]);
	array_push($resultSet,$item);
	$result->MoveNext();
	}
	return $resultSet;
	}

	function GetUniqueKey()
	{
	while(true)
	{
	/* create the new session key here */
	mt_srand(100000000*(double)microtime());
	$sessionId=strtoupper(sprintf("AD%xFD",mt_rand(100000000,999999999))); //9 digit hex session id
	$query = "select SessionKey from ".GetTablePrefix()."UserSession ";
	$query .= "where SessionKey='$sessionId' OR CurrentTempKey='$sessionId' OR PrevTempKey='$sessionId'";
	$rs = $this->adodbConnection->Execute($query);
	if($rs->EOF)
	break;
	if($i>100)
	{
	return "";
	}
	$i++;
	}
	//echo "Getting Unique Key: $sessionId<br>";
	return $sessionId;
	}

	function GetNewSession()
	{
	global $sessionId, $objConfig, $objLanguages, $m_var_list, $FrontEnd;

	$i=0;

	if($this->Get("PortalUserId")>0 \|\| $objConfig->Get("GuestSessions")==1)
	{
	//echo "Creating Session<br>\n";
	$sessionId = $this->GetUniqueKey();
	$this->Set("SessionKey", $sessionId);
	$this->Set("CurrentTempKey",$sessionId);
	if($m_var_list["lang"])
	{
	$this->Set("Language",$m_var_list["lang"]);
	}
	else
	$this->Set("Language", $objLanguages->GetPrimary());
	$this->SetThemeName();
	//$this->Set("Theme", $objConfig->Get("Default_Theme"));
	$this->UpdateAccessTime();
	$this->Set("IpAddress", $_SERVER['REMOTE_ADDR'] );
	$this->Create();

	if($FrontEnd)
	{
	$application =& kApplication::Instance();
	$application->HandleEvent( new kEvent('visits:OnRegisterVisit') );
	}

	}
	else
	$this->Set("SessionKey","");
	}

	function SessionEnabled()
	{
	$res = FALSE;
	$key = $this->GetSessionKey();
	if(strlen($key)>0)
	$res = TRUE;
	return $res;
	}

	function GetSessionKey()
	{
	return $this->Get("SessionKey");
	}

	function SetThemeName($id=0)
	{
	global $objThemes;

	if($id==0)
	$id = $objThemes->GetPrimaryTheme();

	$Theme = $objThemes->GetItem($id);
	$name = $Theme->Get("Name");
	$this->Set("Theme",$name);
	//$this->Update();
	}

	function ValidSession($SessionKey=NULL)
	{
	global $objConfig;

	$a = $this->Get("LastAccessed");
	$cutoff = adodb_mktime()-$objConfig->Get("SessionTimeout");
	//echo $a." ".$cutoff."<br>";
	//$ip = ($_SERVER['REMOTE_ADDR'] == $this->Get("IpAddress"));
	//echo $this->Get("IpAddress");
	//$ip = TRUE;
	if ($a < $cutoff) {
	//$this->UpdateAccessTime();
	}
	return ($a >= $cutoff);


	}

	function UpdateAccessTime()
	{
	$this->Set("LastAccessed", adodb_mktime() );
	}

	function InSpamControl($ResourceId,$DataType=NULL)
	{
	static $ClearStat;

	if(!$ClearStat)
	$this->PurgeSpamControl();
	$ClearStat=1;
	if(strlen($DataType))
	$DataType="'".$DataType."'";
	$sql = "SELECT count(*) as SpamCount FROM ".GetTablePrefix()."SpamControl WHERE ItemResourceId=$ResourceId AND DataType=$DataType";
	if($this->Get("PortalUserId")==-2)
	{
	$sql .= " AND PortalUserId=-2 AND IPaddress='".$_SERVER["REMOTE_ADDR"]."'";
	}
	else
	{
	$sql .= " AND PortalUserId=".$this->Get("PortalUserId");
	}
	$rs = $this->adodbConnection->Execute($sql);
	$value = (int)$rs->fields["SpamCount"];
	if($value>0)
	{
	return TRUE;
	}
	else
	return FALSE;
	}

	function AddToSpamControl($ResourceId,$secstoexpire,$DataType=NULL)
	{
	$expire = adodb_date("U") + $secstoexpire;
	if(strlen($DataType))
	$DataType = "'".$DataType."'";
	$sql = "INSERT INTO ".GetTablePrefix()."SpamControl (ItemResourceId,IPaddress,Expire,PortalUserId,DataType) VALUES (";
	$sql .= $ResourceId.",'".$_SERVER["REMOTE_ADDR"]."',$expire,".$this->Get("PortalUserId").",$DataType)";
	//echo $sql;
	$this->adodbConnection->Execute($sql);
	}

	function PurgeSpamControl()
	{
	$sql = "DELETE FROM ".GetTablePrefix()."SpamControl WHERE Expire<".adodb_date("U");

	$this->adodbConnection->Execute($sql);
	}

	}/* clsUserSession */

	?>

	Property changes on: trunk/kernel/include/usersession.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.55
	\ No newline at end of property
	+1.56
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/incs/catalog.js
	===================================================================
	--- trunk/kernel/admin_templates/incs/catalog.js (revision 7412)
	+++ trunk/kernel/admin_templates/incs/catalog.js (revision 7413)
	@@ -1,325 +1,329 @@
	function Catalog($url_mask, $cookie_prefix, $tab_shift) {
	this.CookiePrefix = $cookie_prefix ? $cookie_prefix : '';
	this.BusyRequest = new Array();
	this.URLMask = $url_mask;
	this.Separator = '#separator#';
	this.ParentCategoryID = 0;
	this.OnResponceMethod = null;
	this.TabShift = isset($tab_shift) ? $tab_shift : 1; // start from 2nd tab (index starting from 0)

	this.TabRegistry = new Array();
	this.ActivePrefix = getCookie(this.CookiePrefix + 'active_prefix');
	this.PreviousPrefix = this.ActivePrefix;
	$ViewMenus = new Array('c');
	}

	Catalog.prototype.Init = function () {
	var $prefix = this.queryTabRegistry('prefix', this.ActivePrefix, 'prefix');
	if ($prefix !== this.ActivePrefix && this.TabRegistry.length > this.TabShift) {
	// ActivePrefix not set or has non-existing prefix value
	this.ActivePrefix = this.TabRegistry[this.TabShift]['prefix'];
	}
	this.SetAlternativeTabs();
	this.AfterInit();
	}

	Catalog.prototype.AfterInit = function () {
	this.go_to_cat();
	}

	Catalog.prototype.SetAlternativeTabs = function () {
	// set alternative grids between all items (catalog is set when tab is loaded via AJAX first time)
	var $i = this.TabShift;
	while ($i < this.TabRegistry.length) {
	// run through all prefixes
	var $j = this.TabShift;
	while ($j < this.TabRegistry.length) {
	if (this.TabRegistry[$i]['prefix'] == this.TabRegistry[$j]['prefix']) {
	$j++;
	continue;
	}
	// and set alternative to all other prefixes
	$GridManager.AddAlternativeGrid(this.TabRegistry[$i]['prefix'], this.TabRegistry[$j]['prefix']);
	$j++;
	}
	$i++;
	}
	}

	Catalog.prototype.submit_kernel_form = function($tab_id) {
	var $prefix = 'dummy';
	var $result_div = '';

	if (isset($tab_id)) {
	// responce result + progress are required
	$prefix = this.queryTabRegistry('tab_id', $tab_id, 'prefix');
	$result_div = $tab_id + '_div';
	}

	var $kf = document.getElementById($form_name);

	Request.params = Request.serializeForm($kf);
	Request.method = $kf.method.toUpperCase();

	this.BusyRequest[$prefix] = false;
	Request.makeRequest($kf.action, this.BusyRequest[$prefix], $result_div, this.successCallback, this.errorCallback, $result_div, this);

	$form_name = 'kernel_form'; // restore back to main form with current category id of catalog
	};

	Catalog.prototype.successCallback = function($request, $params, $object) {
	+
	var $text = $request.responseText;
	+
	var $match_redirect = new RegExp('^#redirect#(.*)').exec($text);
	if ($match_redirect != null) {
	// redirect to external template requested
	window.location.href = $match_redirect[1];
	return false;
	}

	$params = $params.split(',');
	-
	+

	var $js_end = $text.indexOf($object.Separator);
	-// alert($text.substring(0, $js_end));
	if ($js_end != -1) {
	+
	// allow to detect if output is permitted by ajax request parameters
	var $request_visible = '$request_visible = ' + ($params[0].length ? 'true' : 'false') + "\n";
	+
	if ($params[0].length) {
	document.getElementById($params[0]).innerHTML = $text.substring($js_end + $object.Separator.length);
	eval($request_visible + $text.substring(0, $js_end));
	}
	else {
	// eval JS only & set mark that js should not use HTML as usual in grids
	eval($request_visible + $text.substring(0, $js_end));
	}
	}
	+
	else if ($params[0].length) {
	document.getElementById($params[0]).innerHTML = $text;
	}

	if (typeof($object.OnResponceMethod) == 'function') {
	$object.OnResponceMethod($object);
	$object.OnResponceMethod = null;
	}

	if (typeof($Debugger) != 'undefined') {
	$Debugger.Clear();
	}
	}

	Catalog.prototype.errorCallback = function($request, $params, $object) {
	// $Debugger.ShowProps($request, 'req');
	alert('AJAX Error; class: Catalog; ' + Request.getErrorHtml($request));
	}

	Catalog.prototype.submit_event = function($prefix_special, $event, $t, $OnResponceMethod) {
	if (typeof($OnResponceMethod) == 'function') {
	this.OnResponceMethod = $OnResponceMethod;
	}

	var $prev_template = get_hidden_field('t');
	if (!isset($prefix_special)) $prefix_special = this.getCurrentPrefix();
	var $tab_id = this.queryTabRegistry('prefix', $prefix_special, 'tab_id');

	$form_name = $tab_id + '_form'; // set firstly, because set_hidden_field uses it
	if (isset($event)) set_hidden_field('events[' + $prefix_special + ']', $event);
	if (isset($t)) set_hidden_field('t', $t);

	this.submit_kernel_form($tab_id);
	set_hidden_field('t', $prev_template);
	}


	Catalog.prototype.go_to_cat = function($cat_id) {
	if (!isset($cat_id)) {
	// gets current category
	$cat_id = get_hidden_field('m_cat_id');
	}
	else {
	// sets new category to kernel_form in case if item tab
	// loads faster and will check if it's category is same
	// as parent category of categories list

	if (get_hidden_field('m_cat_id') == $cat_id) {
	// it's the same category, then don't reload category list
	return ;
	}
	set_hidden_field('m_cat_id', $cat_id);
	}

	this.resetTabs(false);

	// query sub categories of $cat_id
	var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'in-portal/xml/categories_list').replace('#CATEGORY_ID#', $cat_id);

	var $prefix = this.TabRegistry[0]['prefix'];
	var $tab_id = this.TabRegistry[0]['tab_id'];
	this.BusyRequest[$prefix] = false;
	Request.makeRequest($url, this.BusyRequest[$prefix], $tab_id + '_div', this.successCallback, this.errorCallback, $tab_id + '_div', this);
	this.switchTab(); // refresh current item tab
	}

	// set all item tabs counters to "?" before quering catagories
	Catalog.prototype.resetTabs = function($reset_content) {
	var $i = this.TabShift;
	while ($i < this.TabRegistry.length) {
	this.setItemCount(this.TabRegistry[$i]['prefix'], '?');
	$i++;
	}

	if ($reset_content) {
	// set category for all tabs to -1 (forces reload next time)
	$i = this.TabShift;
	while ($i < this.TabRegistry.length) {
	document.getElementById(this.TabRegistry[$i]['tab_id'] + '_div').setAttribute('category_id', -1);
	$i++;
	}
	}
	}

	Catalog.prototype.switchTab = function($prefix, $force) {
	if (this.queryTabRegistry('prefix', this.ActivePrefix, 'prefix') != this.ActivePrefix) {
	// active prefix is not registred -> cookie left, but not modules installed/enabled at the moment
	return false;
	}

	if (!isset($prefix)) $prefix = this.ActivePrefix;

	if (this.BusyRequest[$prefix]) {
	alert('prefix: ['+$prefix+']; request busy: ['+this.BusyRequest[$prefix]+']');
	}

	if (this.ActivePrefix != $prefix) {
	// hide source tab
	this.PreviousPrefix = this.ActivePrefix;
	document.getElementById(this.PreviousPrefix + '_tab').className = 'catalog-tab-unselected';
	document.getElementById(this.queryTabRegistry('prefix', this.PreviousPrefix, 'tab_id') + '_div').style.display = 'none';
	this.HideDependentButtons(this.PreviousPrefix);
	}

	// show destination tab
	this.ActivePrefix = $prefix;
	document.getElementById(this.ActivePrefix + '_tab').className = 'catalog-tab-selected';
	var $div_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div'; // destination tab
	document.getElementById($div_id).style.display = 'block';
	this.ShowDependentButtons(this.ActivePrefix);
	this.setViewMenu(this.ActivePrefix);
	setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix);

	this.refreshTab($prefix, $div_id, $force);
	}

	Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
	var $cat_id = get_hidden_field('m_cat_id');
	var $tab_cat_id = document.getElementById($div_id).getAttribute('category_id');
	if ($cat_id != $tab_cat_id \|\| $force) {
	// query tab content only in case if not queried or category don't match
	var $url = this.URLMask.replace('#TEMPLATE_NAME#', this.queryTabRegistry('prefix', $prefix, 'module_path') + '/catalog_tab');
	$url = $url.replace('#CATEGORY_ID#', $cat_id);
	$url = $url.replace('#PREFIX#', $prefix);

	this.BusyRequest[$prefix] = false;
	Request.makeRequest($url, this.BusyRequest[$prefix], $div_id, this.successCallback, this.errorCallback, $div_id, this);
	}
	/*else {
	alert('refresh disabled = {tab: '+this.ActivePrefix+'; cat_id: '+$cat_id+'; form_name: '+$form_name+'}');
	}*/
	}

	// adds information about tab to tab_registry
	Catalog.prototype.registerTab = function($tab_id) {
	var $tab = document.getElementById($tab_id + '_div');
	var $index = this.TabRegistry.length;
	this.TabRegistry[$index] = new Array();
	this.TabRegistry[$index]['tab_id'] = $tab_id;
	this.TabRegistry[$index]['prefix'] = $tab.getAttribute('prefix');
	if ($tab_id == 'categories') {
	this.TabRegistry[$index]['module_path'] = 'in-portal/';
	}
	else {
	this.TabRegistry[$index]['module_path'] = $tab.getAttribute('edit_template').substring(0, $tab.getAttribute('edit_template').indexOf('/'));
	}
	this.TabRegistry[$index]['view_template'] = $tab.getAttribute('view_template');
	this.TabRegistry[$index]['edit_template'] = $tab.getAttribute('edit_template');
	this.TabRegistry[$index]['dep_buttons'] = $tab.getAttribute('dep_buttons').length > 0 ? $tab.getAttribute('dep_buttons').split(',') : new Array();
	this.TabRegistry[$index]['index'] = $index;
	}

	// allows to get any information about tab
	Catalog.prototype.queryTabRegistry = function($search_key, $search_value, $return_key) {
	var $i = 0;
	// alert('looking in '+$search_key+' for '+$search_value+' will return '+$return_key)
	while ($i < this.TabRegistry.length) {
	if (this.TabRegistry[$i][$search_key] == $search_value) {
	// alert('got '+this.TabRegistry[$i][$return_key])
	return this.TabRegistry[$i][$return_key];
	break;
	}
	$i++;
	}
	return false;
	}

	Catalog.prototype.ShowDependentButtons = function($prefix) {
	/*var $tab_id = this.queryTabRegistry('prefix', $prefix, 'tab_id')
	if (!document.getElementById($tab_id + '_form')) {
	// tab form not found => no permission to view -> no permission to do any actions
	alert('no form: ['+$tab_id + '_form'+']');
	return ;
	}
	else {
	alert('has form: ['+$tab_id + '_form'+']');
	}*/

	var $dep_buttons = this.queryTabRegistry('prefix', $prefix, 'dep_buttons');
	var $i = 0;
	while ($i < $dep_buttons.length) {
	a_toolbar.ShowButton($dep_buttons[$i]);
	$i++;
	}
	}

	Catalog.prototype.HideDependentButtons = function($prefix) {
	var $dep_buttons = this.queryTabRegistry('prefix', $prefix, 'dep_buttons');
	var $i = 0;
	while ($i < $dep_buttons.length) {
	a_toolbar.HideButton($dep_buttons[$i]);
	$i++;
	}
	}

	Catalog.prototype.setItemCount = function($prefix, $count) {
	setInnerHTML($prefix + '_item_count', $count);
	}

	Catalog.prototype.setCurrentCategory = function($prefix, $category_id) {
	var $tab_id = this.queryTabRegistry('prefix', $prefix, 'tab_id');
	// alert('setting current category for prefix: ['+$prefix+']; tab_id ['+$tab_id+'] = ['+$category_id+']');
	document.getElementById($tab_id + '_div').setAttribute('category_id', $category_id);
	}


	Catalog.prototype.getCurrentPrefix = function() {
	if (isset(Grids[this.ActivePrefix]) && (Grids[this.ActivePrefix].SelectedCount > 0)) {
	// item tab grid exists and some items are selected
	return this.ActivePrefix;
	}
	else {
	// return prefix of first registred tab -> categories
	return this.TabRegistry[0]['prefix'];
	}
	}

	Catalog.prototype.setViewMenu = function($item_prefix) {
	if (this.TabShift == 1) {
	$ViewMenus = isset($item_prefix) ? new Array('c', $item_prefix) : new Array('c');
	}
	else {
	$ViewMenus = isset($item_prefix) ? new Array($item_prefix) : new Array();
	}
	}

	Catalog.prototype.reflectPasteButton = function($status) {
	a_toolbar.SetEnabled('paste', $status);
	a_toolbar.SetEnabled('clear_clipboard', $status);
	}
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/incs/catalog.js
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.30
	\ No newline at end of property
	+1.31
	\ No newline at end of property
	Index: trunk/admin/install/install_lib.php
	===================================================================
	--- trunk/admin/install/install_lib.php (revision 7412)
	+++ trunk/admin/install/install_lib.php (revision 7413)
	@@ -1,1123 +1,1124 @@
	<?php
	function minimum_php_version( $vercheck )
	{
	$minver = explode(".", $vercheck);
	$curver = explode(".", phpversion());
	if (($curver[0] < $minver[0])
	\|\| (($curver[0] == $minver[0])
	&& ($curver[1] < $minver[1]))
	\|\| (($curver[0] == $minver[0]) && ($curver[1] == $minver[1])
	&& ($curver[2][0] < $minver[2][0])))
	return false;
	else
	return true;
	}

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

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

	if($a_version == $b_version) // got PHP and SQL file for one version
	{
	if($a_extension == $b_extension)
	{
	return 0;
	}
	else
	{
	return ($a_extension == 'php') ? 1 : -1; // this makes .php extension go AFTER .sql in the sorting
	}
	}
	else
	{
	return (ConvertVersion($a_version) < ConvertVersion($b_version)) ? -1 : 1;
	}
	}

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

	if (!$dir) return '';

	$upgrades_arr = Array();

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

	usort($upgrades_arr, "VersionSort");

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

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

	return $version;
	}

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

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

	$dec = bindec($bin);

	return $dec;
	}

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

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

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

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

	}
	return $AllFound;
	}

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

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

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

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

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

	}
	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	/**
	* Executes all sqls in selected file (in K4 style)
	*
	* @param string $filename
	* @param kDBConnection $db
	* @param mixed $replace_from
	* @param mixed $replace_to
	*/
	function K4_RunSQL($filename, $replace_from = null, $replace_to = null)
	{
	if (!file_exists(FULL_PATH.$filename)) {
	return ;
	}

	$db =& inst_GetADODBConnection(true);
	$sqls = file_get_contents(FULL_PATH.$filename);

	// add prefix to all tables
	if (strlen(TABLE_PREFIX) > 0) {
	$replacements = Array ('CREATE TABLE ', 'INSERT INTO ', 'UPDATE ', 'ALTER TABLE ');
	foreach ($replacements as $replacement) {
	$sqls = str_replace($replacement, $replacement.TABLE_PREFIX, $sqls);
	}
	$sqls = str_replace('DROP TABLE ', 'DROP TABLE IF EXISTS '.TABLE_PREFIX, $sqls);
	}

	if (isset($replace_from) && isset($replace_to)) {
	// replace something additionally, e.g. module root category
	$sqls = str_replace($replace_from, $replace_to, $sqls);
	}

	+ $sqls = str_replace("\r\n", "\n", $sqls);
	$sqls = explode(";\n", $sqls);

	foreach ($sqls as $sql) {
	$sql = trim($sql);
	if (!$sql \|\| substr($sql, 0, 1) == '#') {
	continue; // usually last line \|\| comment
	}
	$db->Query($sql);
	if ($db->getErrorCode() != 0) {
	$db_error = $db->getErrorMsg()." COMMAND:<PRE>$sql</PRE>";
	$error = true;
	// break;
	}
	}
	}

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

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

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

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


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


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

	function inst_LoadFromRemote()
	{
	return "";
	}

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

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

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

	$data = Array();

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

	function inst_SaveLicense($data)
	{

	}

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

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

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

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


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

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

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

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

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

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

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

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

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

	return FALSE;
	}

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

	$contents = file($file);

	$retval = array();

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

	return $retval;
	}

	function a48d819089308a9aeb447e7248b2587f()
	{
	return _inst_GetModuleList();
	}

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

	$path = $pathtoroot;

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

	function GetDirList ($dirName)
	{

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return $string;
	}

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

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

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

	return $filename.$append;
	}

	return $filename;
	}

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

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

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

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

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

	$app->Redirect('in-portal/modules/modules_list', Array('pass' => 'all', 'admin' => 1, 'RefreshTree' => 1), '', 'index.php');
	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	function moveItemTemplatesToCustom($module_name, $prefix)
	{
	$application =& kApplication::Instance();
	$root_parent_path = $application->Conn->GetOne(
	'SELECT ParentPath FROM '.TABLE_PREFIX.'Category
	WHERE CategoryId = '.$application->ModuleInfo[$module_name]['RootCat']);
	$item_t_customfield = $application->Conn->GetOne('SELECT CustomFieldId FROM '.TABLE_PREFIX.'CustomField WHERE FieldName = \''.$prefix.'_ItemTemplate\'');
	$item_t_customfield = 'l1_cust_'.$item_t_customfield;

	$current_item_tpls = $application->Conn->Query(
	'SELECT ResourceId, ItemTemplate FROM '.TABLE_PREFIX.'Category
	WHERE ParentPath LIKE "'.$root_parent_path.'%" AND ItemTemplate != "" AND ItemTemplate IS NOT NULL');

	foreach ($current_item_tpls as $a_cat) {
	$has_cdata = $application->Conn->GetOne(
	'SELECT CustomDataId FROM '.TABLE_PREFIX.'CategoryCustomData
	WHERE ResourceId = '.$a_cat['ResourceId']);

	if (!$has_cdata) {
	$query = 'INSERT INTO '.TABLE_PREFIX.'CategoryCustomData (ResourceId) VALUES ('.$a_cat['ResourceId'].')';
	$application->Conn->Query($query);
	}

	$query = 'UPDATE '.TABLE_PREFIX.'CategoryCustomData
	SET '.$item_t_customfield.' = '.$application->Conn->qstr($a_cat['ItemTemplate']).'
	WHERE ResourceId = '.$a_cat['ResourceId'];
	$application->Conn->Query($query);
	}

	}
	?>

	Property changes on: trunk/admin/install/install_lib.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.46
	\ No newline at end of property
	+1.47
	\ No newline at end of property
	Index: trunk/core/admin_templates/js/catalog.js
	===================================================================
	--- trunk/core/admin_templates/js/catalog.js (revision 7412)
	+++ trunk/core/admin_templates/js/catalog.js (revision 7413)
	@@ -1,325 +1,329 @@
	function Catalog($url_mask, $cookie_prefix, $tab_shift) {
	this.CookiePrefix = $cookie_prefix ? $cookie_prefix : '';
	this.BusyRequest = new Array();
	this.URLMask = $url_mask;
	this.Separator = '#separator#';
	this.ParentCategoryID = 0;
	this.OnResponceMethod = null;
	this.TabShift = isset($tab_shift) ? $tab_shift : 1; // start from 2nd tab (index starting from 0)

	this.TabRegistry = new Array();
	this.ActivePrefix = getCookie(this.CookiePrefix + 'active_prefix');
	this.PreviousPrefix = this.ActivePrefix;
	$ViewMenus = new Array('c');
	}

	Catalog.prototype.Init = function () {
	var $prefix = this.queryTabRegistry('prefix', this.ActivePrefix, 'prefix');
	if ($prefix !== this.ActivePrefix && this.TabRegistry.length > this.TabShift) {
	// ActivePrefix not set or has non-existing prefix value
	this.ActivePrefix = this.TabRegistry[this.TabShift]['prefix'];
	}
	this.SetAlternativeTabs();
	this.AfterInit();
	}

	Catalog.prototype.AfterInit = function () {
	this.go_to_cat();
	}

	Catalog.prototype.SetAlternativeTabs = function () {
	// set alternative grids between all items (catalog is set when tab is loaded via AJAX first time)
	var $i = this.TabShift;
	while ($i < this.TabRegistry.length) {
	// run through all prefixes
	var $j = this.TabShift;
	while ($j < this.TabRegistry.length) {
	if (this.TabRegistry[$i]['prefix'] == this.TabRegistry[$j]['prefix']) {
	$j++;
	continue;
	}
	// and set alternative to all other prefixes
	$GridManager.AddAlternativeGrid(this.TabRegistry[$i]['prefix'], this.TabRegistry[$j]['prefix']);
	$j++;
	}
	$i++;
	}
	}

	Catalog.prototype.submit_kernel_form = function($tab_id) {
	var $prefix = 'dummy';
	var $result_div = '';

	if (isset($tab_id)) {
	// responce result + progress are required
	$prefix = this.queryTabRegistry('tab_id', $tab_id, 'prefix');
	$result_div = $tab_id + '_div';
	}

	var $kf = document.getElementById($form_name);

	Request.params = Request.serializeForm($kf);
	Request.method = $kf.method.toUpperCase();

	this.BusyRequest[$prefix] = false;
	Request.makeRequest($kf.action, this.BusyRequest[$prefix], $result_div, this.successCallback, this.errorCallback, $result_div, this);

	$form_name = 'kernel_form'; // restore back to main form with current category id of catalog
	};

	Catalog.prototype.successCallback = function($request, $params, $object) {
	+
	var $text = $request.responseText;
	+
	var $match_redirect = new RegExp('^#redirect#(.*)').exec($text);
	if ($match_redirect != null) {
	// redirect to external template requested
	window.location.href = $match_redirect[1];
	return false;
	}

	$params = $params.split(',');
	-
	+

	var $js_end = $text.indexOf($object.Separator);
	-// alert($text.substring(0, $js_end));
	if ($js_end != -1) {
	+
	// allow to detect if output is permitted by ajax request parameters
	var $request_visible = '$request_visible = ' + ($params[0].length ? 'true' : 'false') + "\n";
	+
	if ($params[0].length) {
	document.getElementById($params[0]).innerHTML = $text.substring($js_end + $object.Separator.length);
	eval($request_visible + $text.substring(0, $js_end));
	}
	else {
	// eval JS only & set mark that js should not use HTML as usual in grids
	eval($request_visible + $text.substring(0, $js_end));
	}
	}
	+
	else if ($params[0].length) {
	document.getElementById($params[0]).innerHTML = $text;
	}

	if (typeof($object.OnResponceMethod) == 'function') {
	$object.OnResponceMethod($object);
	$object.OnResponceMethod = null;
	}

	if (typeof($Debugger) != 'undefined') {
	$Debugger.Clear();
	}
	}

	Catalog.prototype.errorCallback = function($request, $params, $object) {
	// $Debugger.ShowProps($request, 'req');
	alert('AJAX Error; class: Catalog; ' + Request.getErrorHtml($request));
	}

	Catalog.prototype.submit_event = function($prefix_special, $event, $t, $OnResponceMethod) {
	if (typeof($OnResponceMethod) == 'function') {
	this.OnResponceMethod = $OnResponceMethod;
	}

	var $prev_template = get_hidden_field('t');
	if (!isset($prefix_special)) $prefix_special = this.getCurrentPrefix();
	var $tab_id = this.queryTabRegistry('prefix', $prefix_special, 'tab_id');

	$form_name = $tab_id + '_form'; // set firstly, because set_hidden_field uses it
	if (isset($event)) set_hidden_field('events[' + $prefix_special + ']', $event);
	if (isset($t)) set_hidden_field('t', $t);

	this.submit_kernel_form($tab_id);
	set_hidden_field('t', $prev_template);
	}


	Catalog.prototype.go_to_cat = function($cat_id) {
	if (!isset($cat_id)) {
	// gets current category
	$cat_id = get_hidden_field('m_cat_id');
	}
	else {
	// sets new category to kernel_form in case if item tab
	// loads faster and will check if it's category is same
	// as parent category of categories list

	if (get_hidden_field('m_cat_id') == $cat_id) {
	// it's the same category, then don't reload category list
	return ;
	}
	set_hidden_field('m_cat_id', $cat_id);
	}

	this.resetTabs(false);

	// query sub categories of $cat_id
	var $url = this.URLMask.replace('#TEMPLATE_NAME#', 'in-portal/xml/categories_list').replace('#CATEGORY_ID#', $cat_id);

	var $prefix = this.TabRegistry[0]['prefix'];
	var $tab_id = this.TabRegistry[0]['tab_id'];
	this.BusyRequest[$prefix] = false;
	Request.makeRequest($url, this.BusyRequest[$prefix], $tab_id + '_div', this.successCallback, this.errorCallback, $tab_id + '_div', this);
	this.switchTab(); // refresh current item tab
	}

	// set all item tabs counters to "?" before quering catagories
	Catalog.prototype.resetTabs = function($reset_content) {
	var $i = this.TabShift;
	while ($i < this.TabRegistry.length) {
	this.setItemCount(this.TabRegistry[$i]['prefix'], '?');
	$i++;
	}

	if ($reset_content) {
	// set category for all tabs to -1 (forces reload next time)
	$i = this.TabShift;
	while ($i < this.TabRegistry.length) {
	document.getElementById(this.TabRegistry[$i]['tab_id'] + '_div').setAttribute('category_id', -1);
	$i++;
	}
	}
	}

	Catalog.prototype.switchTab = function($prefix, $force) {
	if (this.queryTabRegistry('prefix', this.ActivePrefix, 'prefix') != this.ActivePrefix) {
	// active prefix is not registred -> cookie left, but not modules installed/enabled at the moment
	return false;
	}

	if (!isset($prefix)) $prefix = this.ActivePrefix;

	if (this.BusyRequest[$prefix]) {
	alert('prefix: ['+$prefix+']; request busy: ['+this.BusyRequest[$prefix]+']');
	}

	if (this.ActivePrefix != $prefix) {
	// hide source tab
	this.PreviousPrefix = this.ActivePrefix;
	document.getElementById(this.PreviousPrefix + '_tab').className = 'catalog-tab-unselected';
	document.getElementById(this.queryTabRegistry('prefix', this.PreviousPrefix, 'tab_id') + '_div').style.display = 'none';
	this.HideDependentButtons(this.PreviousPrefix);
	}

	// show destination tab
	this.ActivePrefix = $prefix;
	document.getElementById(this.ActivePrefix + '_tab').className = 'catalog-tab-selected';
	var $div_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div'; // destination tab
	document.getElementById($div_id).style.display = 'block';
	this.ShowDependentButtons(this.ActivePrefix);
	this.setViewMenu(this.ActivePrefix);
	setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix);

	this.refreshTab($prefix, $div_id, $force);
	}

	Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
	var $cat_id = get_hidden_field('m_cat_id');
	var $tab_cat_id = document.getElementById($div_id).getAttribute('category_id');
	if ($cat_id != $tab_cat_id \|\| $force) {
	// query tab content only in case if not queried or category don't match
	var $url = this.URLMask.replace('#TEMPLATE_NAME#', this.queryTabRegistry('prefix', $prefix, 'module_path') + '/catalog_tab');
	$url = $url.replace('#CATEGORY_ID#', $cat_id);
	$url = $url.replace('#PREFIX#', $prefix);

	this.BusyRequest[$prefix] = false;
	Request.makeRequest($url, this.BusyRequest[$prefix], $div_id, this.successCallback, this.errorCallback, $div_id, this);
	}
	/*else {
	alert('refresh disabled = {tab: '+this.ActivePrefix+'; cat_id: '+$cat_id+'; form_name: '+$form_name+'}');
	}*/
	}

	// adds information about tab to tab_registry
	Catalog.prototype.registerTab = function($tab_id) {
	var $tab = document.getElementById($tab_id + '_div');
	var $index = this.TabRegistry.length;
	this.TabRegistry[$index] = new Array();
	this.TabRegistry[$index]['tab_id'] = $tab_id;
	this.TabRegistry[$index]['prefix'] = $tab.getAttribute('prefix');
	if ($tab_id == 'categories') {
	this.TabRegistry[$index]['module_path'] = 'in-portal/';
	}
	else {
	this.TabRegistry[$index]['module_path'] = $tab.getAttribute('edit_template').substring(0, $tab.getAttribute('edit_template').indexOf('/'));
	}
	this.TabRegistry[$index]['view_template'] = $tab.getAttribute('view_template');
	this.TabRegistry[$index]['edit_template'] = $tab.getAttribute('edit_template');
	this.TabRegistry[$index]['dep_buttons'] = $tab.getAttribute('dep_buttons').length > 0 ? $tab.getAttribute('dep_buttons').split(',') : new Array();
	this.TabRegistry[$index]['index'] = $index;
	}

	// allows to get any information about tab
	Catalog.prototype.queryTabRegistry = function($search_key, $search_value, $return_key) {
	var $i = 0;
	// alert('looking in '+$search_key+' for '+$search_value+' will return '+$return_key)
	while ($i < this.TabRegistry.length) {
	if (this.TabRegistry[$i][$search_key] == $search_value) {
	// alert('got '+this.TabRegistry[$i][$return_key])
	return this.TabRegistry[$i][$return_key];
	break;
	}
	$i++;
	}
	return false;
	}

	Catalog.prototype.ShowDependentButtons = function($prefix) {
	/*var $tab_id = this.queryTabRegistry('prefix', $prefix, 'tab_id')
	if (!document.getElementById($tab_id + '_form')) {
	// tab form not found => no permission to view -> no permission to do any actions
	alert('no form: ['+$tab_id + '_form'+']');
	return ;
	}
	else {
	alert('has form: ['+$tab_id + '_form'+']');
	}*/

	var $dep_buttons = this.queryTabRegistry('prefix', $prefix, 'dep_buttons');
	var $i = 0;
	while ($i < $dep_buttons.length) {
	a_toolbar.ShowButton($dep_buttons[$i]);
	$i++;
	}
	}

	Catalog.prototype.HideDependentButtons = function($prefix) {
	var $dep_buttons = this.queryTabRegistry('prefix', $prefix, 'dep_buttons');
	var $i = 0;
	while ($i < $dep_buttons.length) {
	a_toolbar.HideButton($dep_buttons[$i]);
	$i++;
	}
	}

	Catalog.prototype.setItemCount = function($prefix, $count) {
	setInnerHTML($prefix + '_item_count', $count);
	}

	Catalog.prototype.setCurrentCategory = function($prefix, $category_id) {
	var $tab_id = this.queryTabRegistry('prefix', $prefix, 'tab_id');
	// alert('setting current category for prefix: ['+$prefix+']; tab_id ['+$tab_id+'] = ['+$category_id+']');
	document.getElementById($tab_id + '_div').setAttribute('category_id', $category_id);
	}


	Catalog.prototype.getCurrentPrefix = function() {
	if (isset(Grids[this.ActivePrefix]) && (Grids[this.ActivePrefix].SelectedCount > 0)) {
	// item tab grid exists and some items are selected
	return this.ActivePrefix;
	}
	else {
	// return prefix of first registred tab -> categories
	return this.TabRegistry[0]['prefix'];
	}
	}

	Catalog.prototype.setViewMenu = function($item_prefix) {
	if (this.TabShift == 1) {
	$ViewMenus = isset($item_prefix) ? new Array('c', $item_prefix) : new Array('c');
	}
	else {
	$ViewMenus = isset($item_prefix) ? new Array($item_prefix) : new Array();
	}
	}

	Catalog.prototype.reflectPasteButton = function($status) {
	a_toolbar.SetEnabled('paste', $status);
	a_toolbar.SetEnabled('clear_clipboard', $status);
	}
	\ No newline at end of file

	Property changes on: trunk/core/admin_templates/js/catalog.js
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.30
	\ No newline at end of property
	+1.31
	\ 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