in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Sat, Aug 16, 9:09 PM

in-portal
View Options

	Index: branches/unlabeled/unlabeled-1.10.2/core/units/categories/cache_updater.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.10.2/core/units/categories/cache_updater.php (revision 7812)
	+++ branches/unlabeled/unlabeled-1.10.2/core/units/categories/cache_updater.php (revision 7813)
	@@ -1,418 +1,419 @@
	<?php
	class clsRecursionStack
	{
	var $Stack;

	function clsRecursionStack()
	{
	$this->Stack = Array();
	}

	function Push($values)
	{
	array_push($this->Stack, $values);
	}

	function Pop()
	{
	if ($this->Count() > 0) {
	return array_pop($this->Stack);
	}
	else {
	return false;
	}
	}

	function Get()
	{
	if ($this->Count() > 0) {
	// return end($this->Stack);
	return $this->Stack[count($this->Stack)-1];
	}
	else {
	return false;
	}
	}

	function Update($values)
	{
	$this->Stack[count($this->Stack)-1] = $values;
	}

	function Count()
	{
	return count($this->Stack);
	}
	}


	class clsCachedPermissions
	{
	var $Allow = Array();
	var $Deny = Array();
	var $CatId;

	function clsCachedPermissions($CatId)
	{
	$this->CatId = $CatId;
	}

	function SetCatId($CatId)
	{
	$this->CatId = $CatId;
	}

	function CheckPermArray($Perm)
	{
	if (!isset($this->Allow[$Perm])) {
	$this->Allow[$Perm] = array();
	$this->Deny[$Perm] = array();
	}
	}

	function AddAllow($Perm, $GroupId)
	{
	$this->CheckPermArray($Perm);
	if (!in_array($GroupId, $this->Allow[$Perm])) {
	array_push($this->Allow[$Perm], $GroupId);
	$this->RemoveDeny($Perm, $GroupId);
	}
	}

	function AddDeny($Perm, $GroupId)
	{
	$this->CheckPermArray($Perm);
	if (!in_array($GroupId, $this->Deny[$Perm])) {
	array_push($this->Deny[$Perm], $GroupId);
	$this->RemoveAllow($Perm, $GroupId);
	}
	}

	function RemoveDeny($Perm, $GroupId)
	{
	if (in_array($GroupId, $this->Deny[$Perm])) {
	array_splice($this->Deny[$Perm], array_search($GroupId, $this->Deny[$Perm]), 1);
	}
	}

	function RemoveAllow($Perm, $GroupId)
	{
	if (in_array($GroupId, $this->Allow[$Perm])) {
	array_splice($this->Allow[$Perm], array_search($GroupId, $this->Allow[$Perm]), 1);
	}
	}

	function GetInsertSQL()
	{
	$values = array();

	$has_deny = array();

	// don't write DACL at all
	/*foreach ($this->Deny as $perm => $groups) {
	if (count($groups) > 0) {
	$values[] = '('.$this->CatId.', '.$perm.', "", "'.join(',', $groups).'")';
	$has_deny[] = $perm;
	}
	}*/

	foreach ($this->Allow as $perm => $groups) {
	// if (in_array($perm, $has_deny)) continue;
	if (count($groups) > 0) {
	$values[] = '(' .$this->CatId. ', ' .$perm. ', "' .join(',', $groups). '", "")';
	}
	}
	if (!$values) return '';
	$sql = 'INSERT INTO '.TABLE_PREFIX.'PermCache (CategoryId, PermId, ACL, DACL) VALUES '.join(',', $values);
	return $sql;
	}
	}

	class kPermCacheUpdater extends kHelper
	{
	/**
	* Holds Stack
	*
	* @var clsRecursionStack
	*/
	var $Stack;
	var $iteration;
	var $totalCats;
	var $doneCats;
	var $table;

	var $primaryLanguageId = 0;
	var $languageCount = 0;
	var $root_prefixes = Array();
	var $StrictPath = false;

	function Init($prefix, $special, $event_params = null)
	{
	parent::Init($prefix, $special, $event_params);

	$continuing = isset($event_params['continue']) ? $event_params['continue'] : 1;
	$this->StrictPath = isset($event_params['strict_path']) ? $event_params['strict_path'] : false;
	if ($this->StrictPath && !is_array($this->StrictPath)) {
	$this->StrictPath = explode('\|', trim($this->StrictPath, '\|'));
	}

	// cache widely used values to speed up process: begin
	$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
	$this->languageCount = $ml_helper->getLanguageCount();
	$this->primaryLanguageId = $this->Application->GetDefaultLanguageId();
	// cache widely used values to speed up process: end

	foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
	$this->root_prefixes[ $module_info['RootCat'] ] = $module_info['Var'];
	}

	$this->iteration = 0;
	$this->table = $this->Application->GetTempName('permCacheUpdate');

	if ($continuing == 1) {
	$this->InitUpdater();
	}
	elseif ($continuing == 2) {
	$this->getData();
	}
	}

	function InitUpdater()
	{
	$this->Stack =& new clsRecursionStack();
	$sql = 'DELETE FROM '.TABLE_PREFIX.'PermCache';
	if ($this->StrictPath) {
	$sql .= ' WHERE CategoryId IN ('.implode(',',$this->StrictPath).')';
	}
	$this->Conn->Query($sql);
	$this->initData();
	}

	function getDonePercent()
	{
	if(!$this->totalCats)return 0;
	return min(100, intval( floor( $this->doneCats / $this->totalCats * 100 ) ));
	}

	function getData()
	{
	$tmp = $this->Conn->GetOne('SELECT data FROM '.$this->table);
	if ($tmp) $tmp = unserialize($tmp);

	$this->totalCats = isset($tmp['totalCats']) ? $tmp['totalCats'] : 0;
	$this->doneCats = isset($tmp['doneCats']) ? $tmp['doneCats'] : 0;
	if (isset($tmp['stack'])) {
	$this->Stack = $tmp['stack'];
	}
	else {
	$this->Stack = & new clsRecursionStack();
	}
	}

	function setData()
	{
	$tmp = Array (
	'totalCats' => $this->totalCats,
	'doneCats' => $this->doneCats,
	'stack' => $this->Stack,
	);

	$this->Conn->Query('DELETE FROM '.$this->table);

	$fields_hash = Array('data' => serialize($tmp));
	$this->Conn->doInsert($fields_hash, $this->table);
	}

	function initData()
	{
	$this->clearData(); // drop table before starting anyway

	$this->Conn->Query('CREATE TABLE '.$this->table.'(data LONGTEXT)');

	$this->totalCats = (int)$this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Category');
	$this->doneCats = 0;
	}

	function clearData()
	{
	$this->Conn->Query('DROP TABLE IF EXISTS '.$this->table);
	$this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = \'ForcePermCacheUpdate\'');
	}

	function DoTheJob()
	{
	$data = $this->Stack->Get();
	if ($data === false) { //If Stack is empty
	$data['current_id'] = 0;
	$data['titles'] = Array();
	$data['parent_path'] = Array();
	$data['named_path'] = Array();
	$data['category_template'] = '';
	$data['item_template'] = '';
	$data['children_count'] = 0;
	+ $data['system'] = 0;
	$this->Stack->Push($data);
	}

	if (!isset($data['queried'])) {
	$this->QueryTitle($data);
	$this->QueryChildren($data);
	$data['children_count'] = count($data['children']);
	$this->QueryPermissions($data);
	$data['queried'] = 1;

	if ($sql = $data['perms']->GetInsertSQL()) {
	$this->Conn->Query($sql);
	// $this->doneCats++; // moved to the place where it pops out of the stack by Kostja
	}
	$this->iteration++;
	}

	// start with first child if we haven't started yet
	if (!isset($data['current_child'])) $data['current_child'] = 0;

	// if we have more children
	if (isset($data['children'][$data['current_child']])) {
	if ($this->StrictPath) {
	while ( isset($data['children'][ $data['current_child'] ]) && !in_array($data['children'][ $data['current_child'] ], $this->StrictPath) ) {
	$data['current_child']++;
	continue;
	}
	if (!isset($data['children'][ $data['current_child'] ])) return false; //error
	}
	$next_data = Array();
	$next_data['titles'] = $data['titles'];
	$next_data['parent_path'] = $data['parent_path'];
	$next_data['named_path'] = $data['named_path'];
	$next_data['category_template'] = $data['category_template'];
	$next_data['item_template'] = $data['item_template'];
	$next_data['current_id'] = $data['children'][ $data['current_child'] ]; //next iteration should process child
	$next_data['perms'] = $data['perms']; //we should copy our permissions to child - inheritance
	$next_data['perms']->SetCatId($next_data['current_id']);
	$data['current_child']++;
	$this->Stack->Update($data); //we need to update ourself for the iteration after the next (or further) return to next child
	$this->Stack->Push($next_data); //next iteration should process this child
	return true;
	}
	else {
	$this->UpdateCachedPath($data);
	$prev_data = $this->Stack->Pop(); //remove ourself from stack if we have finished all the childs (or there are none)
	// we are getting here if we finished with current level, so check if it's first level - then bail out.

	$this->doneCats++; // moved by Kostja from above, seems to fix the prob
	$has_more = $this->Stack->Count() > 0;
	if ($has_more) {
	$next_data = $this->Stack->Get();
	$next_data['children_count'] += $data['children_count'];
	$this->Stack->Update($next_data);
	}
	return $has_more;
	}
	}

	function UpdateCachedPath(&$data)
	{
	$fields_hash = Array (
	'ParentPath' => '\|'.implode('\|', $data['parent_path']).'\|',
	'NamedParentPath' => $data['system'] ? $data['file_name'] : implode('/', $data['named_path'] ),
	'CachedCategoryTemplate' => $data['category_template'],
	'CachedDescendantCatsQty' => $data['children_count'],
	);

	$i = 1;
	while ($i <= $this->languageCount) {
	$fields_hash['l'.$i.'_CachedNavbar'] = implode('&\|&', $data['titles'][$i]);
	$i++;
	}

	$this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'Category', 'CategoryId = '.$data['current_id']);
	}

	function QueryTitle(&$data)
	{
	$category_id = $data['current_id'];
	$sql = 'SELECT *
	FROM '.TABLE_PREFIX.'Category
	WHERE CategoryId = '.$category_id;

	$record = $this->Conn->GetRow($sql);
	if ($record) {
	$i = 1;
	while ($i <= $this->languageCount) {
	$data['titles'][$i][] = $record['l'.$i.'_Name'] ? $record['l'.$i.'_Name'] : $record['l'.$this->primaryLanguageId.'_Name'];
	$i++;
	}

	$data['parent_path'][] = $category_id;
	$data['named_path'][] = preg_replace('/^Content\\//', '', $record['Filename']);
	$data['system'] = $record['IsSystem'];
	$data['file_name'] = $record['Filename'];

	// it is one of the modules root category
	$root_prefix = isset($this->root_prefixes[$category_id]) ? $this->root_prefixes[$category_id] : false;
	if ($root_prefix) {
	$fields_hash = Array();
	if (!$record['CategoryTemplate']) {
	$record['CategoryTemplate'] = $this->Application->ConfigValue($root_prefix.'_CategoryTemplate');
	$fields_hash['CategoryTemplate'] = $record['CategoryTemplate'];
	}

	$this->Conn->doUpdate($fields_hash, TABLE_PREFIX.'Category', 'CategoryId = '.$category_id);
	}

	// if explicitly set, then use it; use parent template otherwise
	if ($record['CategoryTemplate']) {
	$data['category_template'] = $record['CategoryTemplate'];
	}
	}

	}

	function QueryChildren(&$data)
	{
	$sql = 'SELECT CategoryId
	FROM '.TABLE_PREFIX.'Category
	WHERE ParentId = '.$data['current_id'];
	$data['children'] = $this->Conn->GetCol($sql);
	}

	function QueryPermissions(&$data)
	{
	// don't search for section "view" permissions here :)
	$sql = 'SELECT ipc.PermissionConfigId, ip.GroupId, ip.PermissionValue
	FROM '.TABLE_PREFIX.'Permissions AS ip
	LEFT JOIN '.TABLE_PREFIX.'PermissionConfig AS ipc ON ipc.PermissionName = ip.Permission
	WHERE (CatId = '.$data['current_id'].') AND (Permission LIKE "%.VIEW") AND (ip.Type = 0)';

	$records = $this->Conn->Query($sql);

	//create permissions array only if we don't have it yet (set by parent)
	if (!isset($data['perms'])) {
	$data['perms'] = new clsCachedPermissions($data['current_id']);
	}

	foreach ($records as $record) {
	if ($record['PermissionValue'] == 1) {
	$data['perms']->AddAllow($record['PermissionConfigId'], $record['GroupId']);
	}
	else {
	$data['perms']->AddDeny($record['PermissionConfigId'], $record['GroupId']);
	}
	}
	}

	/**
	* Rebuild all cache in one step
	*
	*/
	function OneStepRun($path='')
	{
	$this->InitUpdater();
	$needs_more = true;
	while ($needs_more) {
	// until proceeeded in this step category count exceeds category per step limit
	$needs_more = $this->DoTheJob();
	}
	$this->clearData();
	}
	}
	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.10.2/core/units/categories/cache_updater.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.10.2.1
	\ No newline at end of property
	+1.10.2.2
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.8.2/core/units/general/helpers/modules.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.8.2/core/units/general/helpers/modules.php (revision 7812)
	+++ branches/unlabeled/unlabeled-1.8.2/core/units/general/helpers/modules.php (revision 7813)
	@@ -1,370 +1,372 @@
	<?php

	class kModulesHelper extends kHelper {

	function checkLogin()
	{
	return $this->_GetModules();
	}

	function getWhereClause()
	{
	$where_clause = Array('Loaded = 1');

	if (!$this->Application->IsAdmin()) return implode(' AND ', $where_clause);

	$modules = $this->_GetModules();
	if ($modules) {
	foreach ($modules as $module_index => $module) {
	$modules[$module_index] = $this->Conn->qstr($module);
	}
	$where_clause[] = 'Name IN ('.implode(',', $modules).')';
	}

	return implode(' AND ', $where_clause);
	}

	function _EnableCookieSID()
	{
	$session =& $this->Application->recallObject('Session');
	return $session->CookiesEnabled;
	}

	function _IsSpider($UserAgent)
	{
	global $robots;
	$lines = file(FULL_PATH.'/robots_list.txt');

	if (!is_array($robots)) {
	$robots = Array();
	for($i = 0; $i < count($lines); $i++) {
	$l = $lines[$i];
	$p = explode("\t", $l, 3);
	$robots[] = $p[2];
	}
	}
	return in_array($UserAgent, $robots);
	}

	function _MatchIp($ip1, $ip2)
	{
	$matched = TRUE;

	$ip = explode('.', $ip1);
	$MatchIp = explode('.', $ip2);
	for ($i = 0; $i < count($ip); $i++) {
	if($i == count($MatchIp)) break;
	if (trim($ip[$i]) != trim($MatchIp[$i]) \|\| trim($ip[$i]) == '*') {
	$matched = FALSE;
	break;
	}
	}
	return $matched;
	}

	function _IpAccess($IpAddress, $AllowList, $DenyList)
	{
	$allowed = explode(',', $AllowList);
	$denied = explode(',', $DenyList);

	$MatchAllowed = FALSE;
	for ($x = 0; $x < count($allowed); $x++) {
	$ip = explode('.', $allowed[$x]);

	$MatchAllowed = $this->_MatchIp($IpAddress, $allowed[$x]);
	if ($MatchAllowed)
	break;
	}
	$MatchDenied = FALSE;
	for ($x = 0; $x < count($denied); $x++) {
	$ip = explode('.', $denied[$x]);

	$MatchDenied = $this->_MatchIp($IpAddress, $denied[$x]);
	if ($MatchDenied)
	break;
	}

	$Result = (($MatchAllowed && !$MatchDenied) \|\| (!$MatchAllowed && !$MatchDenied) \|\|
	($MatchAllowed && $MatchDenied));
	return $Result;
	}

	/**
	* Reads config.php file and parses it
	*
	*/
	function _readConfig()
	{
	$vars = parse_portal_ini(FULL_PATH.'/config.php');

	foreach ($vars as $config_key => $config_value) {
	$GLOBALS['g_'.$config_key] = $config_value;
	}
	}

	/**
	* Leaves only domain part from hostname (e.g. extract "intechnic.lv" from "test.intechnic.lv")
	* Used for admin login license check
	*
	* @param string $d
	* @return string
	*/
	function _StripDomainHost($d)
	{
	$IsIp = false;
	$dotcount = substr_count($d, '.');
	if ($dotcount == 3) {
	$IsIp = true;
	for ($x = 0; $x < strlen($d); $x++) {
	if (!is_numeric(substr($d, $x, 1)) && substr($d, $x, 1) != '.')
	{
	$IsIp = false;
	break;
	}
	}
	}

	if ($dotcount > 1 && !$IsIp) {
	$p = explode('.', $d);
	$ret = $p[count($p) - 2].'.'.$p[count($p) - 1];
	}
	else {
	$ret = $d;
	}
	return $ret;
	}

	/**
	* When logging into admin then check only last 2 parts of host name VS domain in license
	*
	* @param string $user_domain
	* @param string $license_domain
	* @return int
	*/
	function _CheckDomain($user_domain, $license_domain)
	{
	if ($this->Application->IsAdmin()) {
	$user_domain = $this->_StripDomainHost($user_domain);
	return preg_match('/(.*)'.preg_quote($user_domain, '/').'$/', $license_domain);
	}
	else {
	return preg_match('/(.*)'.preg_quote($license_domain, '/').'$/', $user_domain);
	}
	}

	/**
	* Returns modules list, that are in license
	*
	* @return Array
	*/
	function _GetModules()
	{
	global $i_Keys;
	static $modules = null;

	if (isset($modules)) return $modules;

	$this->_readConfig();
	- $license = base64_decode($GLOBALS['g_License']);
	+ $license = isset($GLOBALS['g_License']) ? base64_decode($GLOBALS['g_License']) : '';
	$this->_ParseLicense($license);

	$modules = Array();
	$domain = $this->_GetDomain();
	if (!$this->_IsLocalSite($domain)) {
	for ($x = 0; $x < count($i_Keys); $x++) {
	$key = $i_Keys[$x];
	if ($this->_CheckDomain($domain, $key['domain'])) {
	// used hostname is subdomain or matches domain from license
	$modules = explode(',', $key['mod']);
	}
	}
	}
	else {
	$modules = array_keys($this->Application->ModuleInfo);
	}
	- array_push($modules, 'Core', 'Proj-base', 'Proj-CMS', 'Custom');
	+
	+ array_push($modules, 'Core', 'Proj-base', 'Proj-CMS', 'Custom');
	return $modules;
	}

	/**
	* Allows to determine if module is licensed
	*
	* @param string $name
	* @return bool
	*/
	function _ModuleLicensed($name)
	{
	$modules = $this->_GetModules();
	return in_array($name, $modules);
	}

	/**
	* Returns domain from licences (and direct in case of install script)
	*
	* @return string
	*/
	function _GetDomain()
	{
	- return $this->Application->ConfigValue('DomainDetect') ? $_SERVER['HTTP_HOST'] : $GLOBALS['g_Domain'];
	+ $config_domain = isset($GLOBALS['g_Domain']) ? $GLOBALS['g_Domain'] : '';
	+ return $this->Application->ConfigValue('DomainDetect') ? $_SERVER['HTTP_HOST'] : $config_domain;
	}

	function _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 _decrypt($txt, $key)
	{
	$txt = $this->_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 LoadFromRemote()
	{
	return '';
	}

	function DLid()
	{
	die($GLOBALS['lid']."\n");
	}

	function _LoadLicense($LoadRemote = false)
	{
	$f = FULL_PATH.'/intechnic.php';
	if ($this->_falseIsLocalSite($f)) $ret = true;
	if (file_exists($f)) {
	$contents = file($f);
	$data = base64_decode($contents[1]);
	}
	else {
	if ($LoadRemote) return $LoadFromRemote;
	}
	return $data;
	}

	function _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 _ParseLicense($txt)
	{
	global $i_User, $i_Pswd, $i_Keys;
	if (!$this->_falseIsLocalSite($txt)) $nah = false;
	$data = $this->_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 ($this->_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 _GetObscureValue($i)
	{
	if ($i == 'x') return 0254; $z = '';
	if ($i == 'z') return 0x7F.'.';
	if ($i == 'c') return '--code--';
	if ($i >= 5 && $i < 7) return $this->_GetObscureValue($z)*$this->_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 '.'.($this->_GetObscureValue(6.5)+1);
	if ($i == 'a') return 0xa;
	}

	function _Chr($val)
	{
	$x = $this->_GetObscureValue(25);
	$f = chr($x).chr($x+5).chr($x+15);
	return $f($val);
	}

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

	function _falseIsLocalSite($domain)
	{
	$localb = FALSE;
	if(substr($domain,0,3)=="172")
	{
	$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;
	}
	}

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.8.2/core/units/general/helpers/modules.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.8
	\ No newline at end of property
	+1.8.2.1
	\ No newline at end of property
	Index: branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php
	===================================================================
	--- branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php (revision 7812)
	+++ branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php (revision 7813)
	@@ -1,180 +1,180 @@
	<?php

	$config = Array(
	'Prefix' => 'lang',
	'ItemClass' => Array('class'=>'LanguagesItem','file'=>'languages_item.php','build_event'=>'OnItemBuild'),
	'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
	'EventHandlerClass' => Array('class'=>'LanguagesEventHandler','file'=>'languages_event_handler.php','build_event'=>'OnBuild'),
	'TagProcessorClass' => Array('class'=>'LanguagesTagProcessor','file'=>'languages_tag_processor.php','build_event'=>'OnBuild'),
	'RegisterClasses' => Array(
	Array('pseudo'=>'LangXML','class'=>'LangXML_Parser','file'=>'import_xml.php'),
	),

	'AutoLoad' => true,
	'Hooks' => Array(
	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'lang',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnReflectMultiLingualFields',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'lang',
	'HookToSpecial' => '',
	'HookToEvent' => Array('OnPreSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnCopyLabels',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'lang',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnSave'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnUpdatePrimary',
	),

	Array(
	'Mode' => hAFTER,
	'Conditional' => false,
	'HookToPrefix' => 'lang',
	'HookToSpecial' => '*',
	'HookToEvent' => Array('OnSave','OnMassDelete'),
	'DoPrefix' => '',
	'DoSpecial' => '',
	'DoEvent' => 'OnScheduleTopFrameReload',
	),

	),
	'QueryString' => Array(
	1 => 'id',
	2 => 'page',
	3 => 'event',
	4 => 'mode',
	),
	'IDField' => 'LanguageId',

	'StatusField' => Array('Enabled','PrimaryLang'), // field, that is affected by Approve/Decline events

	'TitleField' => 'PackName', // field, used in bluebar when editing existing item

	'TitlePresets' => Array(
	'default' => Array( 'new_status_labels' => Array('lang'=>'!la_title_Adding_Language!'),
	'edit_status_labels' => Array('lang'=>'!la_title_Editing_Language!'),
	'new_titlefield' => Array('lang'=>''),
	),

	'languages_list' => Array( 'prefixes' => Array('lang_List'), 'format' => "!la_title_Configuration! - !la_title_LanguagePacks! (#lang_recordcount#)"),

	'languages_edit_general' => Array( 'prefixes' => Array('lang'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_General!"),

	'phrases_list' => Array( 'prefixes' => Array('lang','phrases_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_Labels! (#phrases_recordcount#)"),

	'import_language' => Array( 'prefixes' => Array('phrases.import'), 'format' => "!la_title_InstallLanguagePackStep1!"),

	'import_language_step2' => Array( 'prefixes' => Array('phrases.import'), 'format' => "!la_title_InstallLanguagePackStep2!"),

	'export_language' => Array( 'prefixes' => Array('phrases.export'), 'format' => "!la_title_ExportLanguagePackStep1!"),

	'export_language_results' => Array( 'prefixes' => Array('phrases.export'), 'format' => "!la_title_ExportLanguagePackResults!"),

	'events_list' => Array( 'prefixes' => Array('lang','emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents! (#emailevents_recordcount#)"),

	'event_edit' => Array( 'prefixes' => Array('emailevents'),
	'edit_status_labels' => Array('emailevents' => '!la_title_Editing_EmailEvent!'),
	'format' => '#emailevents_status# - #emailevents_titlefield#'),

	'email_messages_edit' => Array( 'prefixes' => Array('lang','emailmessages'),
	'new_titlefield' => Array('emailmessages' => ''),
	'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailmessages_titlefield#'"),
	),

	'PermSection' => Array('main' => 'in-portal:configure_lang'),

	'Sections' => Array(
	'in-portal:configure_lang' => Array(
	'parent' => 'in-portal:system',
	'icon' => 'conf_regional',
	'label' => 'la_tab_Regional',
	'url' => Array('t' => 'regional/languages_list', 'pass' => 'm'),
	'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:set_primary', 'advanced:import', 'advanced:export'),
	'priority' => 2,
	'type' => stTREE,
	),

	),

	'TableName' => TABLE_PREFIX.'Language',
	'SubItems' => Array('phrases','emailmessages'),

	'FilterMenu' => Array(
	'Groups' => Array(
	Array('mode' => 'AND', 'filters' => Array(0,1), 'type' => WHERE_FILTER),
	),

	'Filters' => Array(
	0 => Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 1' ),
	1 => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Enabled != 0' ),
	)
	),

	'AutoDelete' => true,

	'AutoClone' => true,

	'ListSQLs' => Array( ''=>'SELECT * FROM %s',
	), // key - special, value - list select sql
	'ItemSQLs' => Array( ''=>'SELECT * FROM %s',
	),
	'ListSortings' => Array(
	'' => Array(
	'Sorting' => Array('PackName' => 'asc'),
	)
	),
	'Fields' => Array(
	- 'LanguageId' => Array(),
	+ 'LanguageId' => Array('type' => 'int'),
	'PackName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'LocalName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1', 'default' => 1),
	'PrimaryLang' => Array('type' => 'int','not_null' => '1','default' => '0'),
	'IconURL' => Array('type' => 'string','default' => ''),
	'DateFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'TimeFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'InputDateFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('m/d/Y' => 'm/d/Y', 'd/m/Y' => 'd/m/Y'), 'not_null' => '1','default' => 'm/d/Y', 'required' => 1),
	'InputTimeFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('g:i:s A' => 'g:i:s A', 'g:i A' => 'g:i A', 'H:i:s' => 'H:i:s', 'H:i' => 'H:i' ), 'not_null' => '1','default' => 'g:i:s A', 'required' => 1),
	'DecimalPoint' => Array('type' => 'string','not_null' => '1','default' => ''),
	'ThousandSep' => Array('type' => 'string','not_null' => '1','default' => ''),
	'Charset' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
	'UnitSystem' => Array('type' => 'int','not_null' => '1','default' => '1','formatter' => 'kOptionsFormatter','options' => Array(1 => 'la_Metric', 2 => 'la_US_UK'),'use_phrases' => 1),
	),

	'VirtualFields' => Array(
	'CopyLabels' => Array('type' => 'int', 'default' => 0),
	'CopyFromLanguage' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language ORDER BY PackName', 'option_title_field' => 'PackName', 'option_key_field' => 'LanguageId'),
	),

	'Grids' => Array(
	'Default' => Array(
	'Icons' => Array('default'=>'icon16_custom.gif','0_0'=>'icon16_language_disabled.gif','1_0'=>'icon16_language.gif','0_1'=>'icon16_language_disabled.gif','1_1'=>'icon16_language_primary.gif'),
	'Fields' => Array(
	'PackName' => Array( 'title'=>'la_col_PackName', 'data_block' => 'grid_checkbox_td'),
	'LocalName' => Array( 'title'=>'la_col_LocalName' ),
	'Enabled' => Array( 'title'=>'la_col_Status' ),
	),

	),
	),
	);

	?>
	\ No newline at end of file

	Property changes on: branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.21.2.1
	\ No newline at end of property
	+1.21.2.2
	\ 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