in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Sat, Feb 22, 7:55 AM

in-portal
View Options

	Index: branches/5.1.x/core/kernel/session/inp_session.php
	===================================================================
	--- branches/5.1.x/core/kernel/session/inp_session.php (revision 14324)
	+++ branches/5.1.x/core/kernel/session/inp_session.php (revision 14325)
	@@ -1,155 +1,158 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
	* @license GNU/GPL
	* In-Portal is Open Source software.
	* This means that this software may have been modified pursuant
	* the GNU General Public License, and as distributed it includes
	* or is derivative of works licensed under the GNU General Public License
	* or other free or open source software licenses.
	* See http://www.in-portal.org/license for copyright notices and details.
	*/

	defined('FULL_PATH') or die('restricted access!');

	class InpSession extends Session
	{
	function Init($prefix, $special)
	{
	$this->SessionTimeout = $this->Application->ConfigValue('SessionTimeout');

	$path = (BASE_PATH == '') ? '/' : BASE_PATH;
	$this->SetCookiePath($path);

	$cookie_name = $this->Application->ConfigValue('SessionCookieName');
	if (!$cookie_name) {
	$cookie_name = 'sid';
	}

	$admin_session = ($this->Application->isAdmin && $special !== 'front') \|\| ($special == 'admin');

	if ($admin_session) {
	$cookie_name = 'adm_' . $cookie_name;
	}

	$this->SetCookieName($cookie_name);

	$this->SetCookieDomain(SERVER_NAME);

	if ($admin_session) {
	$mode = smAUTO;
	}
	elseif (defined('IS_INSTALL') && IS_INSTALL) {
	$mode = smCOOKIES_ONLY;
	}
	else {
	$ses_mode = $this->Application->ConfigValue('CookieSessions');

	if ($ses_mode == 2) $mode = smAUTO;
	if ($ses_mode == 1) $mode = smCOOKIES_ONLY;
	if ($ses_mode == 0) $mode = smGET_ONLY;
	}

	$this->SetMode($mode);

	parent::Init($prefix, $special);

	if (!$this->Application->isAdmin && $this->GetField('PortalUserId') <= 0) {
	$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
	$this->SetField('GroupId', $this->Application->ConfigValue('User_GuestGroup'));
	$this->SetField('GroupList', $group_list);
	}
	}

	function Destroy()
	{
	$this->Storage->DeleteSession($this);
	$this->Storage->DeleteEditTables();
	$this->Data = new Params();
	$this->SID = $this->CachedSID = '';

	if ($this->CookiesEnabled) {
	$this->SetSessionCookie(); //will remove the cookie due to value (sid) is empty
	}

	$this->SetSession(); //will create a new session
	}

	}

	class InpSessionStorage extends SessionStorage {

	function Init($prefix,$special)
	{
	parent::Init($prefix,$special);
	$this->setTableName(TABLE_PREFIX.'UserSession');
	$this->SessionDataTable = TABLE_PREFIX.'SessionData';
	$this->setIDField('SessionKey');
	$this->TimestampField = 'LastAccessed';
	$this->DataValueField = 'VariableValue';
	$this->DataVarField = 'VariableName';
	}

	function LocateSession($sid)
	{
	$res = parent::LocateSession($sid);
	if ($res) {
	$this->Expiration += $this->SessionTimeout;
	}
	return $res;
	}

	function UpdateSession(&$session)
	{
	$time = adodb_mktime();
	// Update LastAccessed only if it's newer than 1/10 of session timeout - perfomance optimization to eliminate needless updates on every click
	// if ($time - $this->DirectVars['LastAccessed'] > $this->SessionTimeout/10) {
	$this->SetField($session, $this->TimestampField, $time + $this->SessionTimeout);
	// }
	}

	function GetSessionDefaults(&$session)
	{
	$fields_hash = Array (
	'PortalUserId' => $this->Application->isAdmin ? 0 : USER_GUEST,
	'Language' => $this->Application->GetDefaultLanguageId(true),
	'Theme' => $this->Application->GetDefaultThemeId(),
	- 'IpAddress' => $_SERVER['REMOTE_ADDR'], // getenv('REMOTE_ADDR') won't work on IIS, so use $_SERVER instead
	'GroupId' => $this->Application->ConfigValue('User_GuestGroup'),
	'GroupList' => $this->Application->ConfigValue('User_GuestGroup'),
	);

	+ if( isset($_SERVER['REMOTE_ADDR']) ) {
	+ $fields_hash['IpAddress'] = $_SERVER['REMOTE_ADDR']; // getenv('REMOTE_ADDR') won't work on IIS, so use $_SERVER instead
	+ }
	+
	return array_merge($fields_hash, parent::GetSessionDefaults($session));
	}

	function GetExpiredSIDs()
	{
	$query = ' SELECT '.$this->IDField.' FROM '.$this->TableName.' WHERE '.$this->TimestampField.' < '.(adodb_mktime());
	$ret = $this->Conn->GetCol($query);
	if($ret) {
	$this->DeleteEditTables();
	}
	return $ret;

	}

	function DeleteEditTables()
	{
	$tables = $this->Conn->GetCol('SHOW TABLES');
	$mask_edit_table = '/'.TABLE_PREFIX.'ses_(.)_edit_(.)/';
	$mask_search_table = '/'.TABLE_PREFIX.'ses_(.?)_(.)/';

	$sql='SELECT COUNT(*) FROM '.$this->TableName.' WHERE '.$this->IDField.' = \'%s\'';
	foreach($tables as $table)
	{
	if( preg_match($mask_edit_table,$table,$rets) \|\| preg_match($mask_search_table,$table,$rets) )
	{
	$sid = preg_replace('/(.)_(.)/', '\\1', $rets[1]); // remove popup's wid from sid
	$is_alive = $this->Conn->GetOne( sprintf($sql,$sid) );
	if(!$is_alive) $this->Conn->Query('DROP TABLE IF EXISTS '.$table);
	}
	}
	}
	}
	\ No newline at end of file
	Index: branches/5.1.x/core/kernel/utility/http_query.php
	===================================================================
	--- branches/5.1.x/core/kernel/utility/http_query.php (revision 14324)
	+++ branches/5.1.x/core/kernel/utility/http_query.php (revision 14325)
	@@ -1,766 +1,766 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
	* @license GNU/GPL
	* In-Portal is Open Source software.
	* This means that this software may have been modified pursuant
	* the GNU General Public License, and as distributed it includes
	* or is derivative of works licensed under the GNU General Public License
	* or other free or open source software licenses.
	* See http://www.in-portal.org/license for copyright notices and details.
	*/

	defined('FULL_PATH') or die('restricted access!');

	class kHTTPQuery extends Params {

	/**
	* $_POST vars
	*
	* @var Array
	* @access private
	*/
	var $Post;

	/**
	* $_GET vars
	*
	* @var Array
	* @access private
	*/
	var $Get;

	/**
	* $_COOKIE vars
	*
	* @var Array
	* @access private
	*/
	var $Cookie;

	/**
	* $_SERVER vars
	*
	* @var Array
	* @access private
	*/
	var $Server;

	/**
	* $_ENV vars
	*
	* @var Array
	* @access private
	*/
	var $Env;

	/**
	* Order in what write
	* all vars together in
	* the same array
	*
	* @var string
	*/
	var $Order;

	/**
	* Uploaded files info
	*
	* @var Array
	* @access private
	*/
	var $Files;

	var $specialsToRemove = Array();

	/**
	* Description
	*
	* @var kDBConnection
	* @access public
	*/
	var $Conn;

	/**
	* SessionID is given via "sid" variable in query string
	*
	* @var bool
	*/
	var $_sidInQueryString = false;

	/**
	* Loads info from $_POST, $_GET and
	* related arrays into common place
	*
	* @param string $order
	* @return HTTPQuery
	* @access public
	*/
	function kHTTPQuery($order = 'CGPF')
	{
	parent::Params();

	$this->Conn =& $this->Application->GetADODBConnection();
	$this->Order = $order;

	- if (array_key_exists('HTTP_X_REQUESTED_WITH', $_SERVER) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
	+ if ( isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
	// when AJAX request is made from jQuery, then create ajax variable,
	// so any logic based in it (like redirects) will not break down
	$_GET['ajax'] = 'yes';
	}
	}

	function Init($prefix, $special)
	{
	$this->AddAllVars();

	$this->specialsToRemove = $this->Get('remove_specials');
	if ($this->specialsToRemove) {
	foreach ($this->specialsToRemove as $prefix_special => $flag) {
	if ($flag && strpos($prefix_special, '.') === false) {
	unset($this->specialsToRemove[$prefix_special]);
	trigger_error('Incorrect usage of "<strong>remove_specials['.$prefix_special.']</strong>" field (no special found)', E_USER_NOTICE);
	}
	}
	$this->_Params = $this->removeSpecials($this->_Params);
	}
	ini_set('magic_quotes_gpc', 0);
	}

	function removeSpecials($array)
	{
	$ret = Array();
	$removed = false;
	foreach ($this->specialsToRemove as $prefix_special => $flag) {
	if ($flag) {
	$removed = true;
	list ($prefix,$special) = explode('.', $prefix_special, 2);
	foreach ($array as $key => $val) {
	$new_key = preg_match("/^".$prefix."[._]{1}".$special."(.*)/", $key, $regs) ? $prefix.$regs[1] : $key;
	$ret[$new_key] = is_array($val) ? $this->removeSpecials($val) : $val;
	}
	}
	}
	return $removed ? $ret : $array;
	}

	/**
	* All all requested vars to
	* common storage place
	*
	* @access private
	*/
	function AddAllVars()
	{
	for ($i=0; $i < strlen($this->Order); $i++)
	{
	$current = $this->Order[$i];
	switch ($current) {
	case 'G':
	$this->Get = $this->AddVars($_GET);
	if (array_key_exists('sid', $_GET)) {
	$this->_sidInQueryString = true;
	}

	$vars = $this->processQueryString( $this->Get(ENV_VAR_NAME) );

	if (array_key_exists('sid', $vars)) {
	// used by Session::GetPassedSIDValue
	$this->Get['sid'] = $vars['sid'];
	}

	$this->AddParams($vars);
	break;

	case 'P':
	$this->Post = $this->AddVars($_POST);
	$this->convertPostEvents();
	$this->_processPostEnvVariables();
	break;

	case 'C':
	$this->Cookie = $this->AddVars($_COOKIE);
	break;

	case 'E';
	$this->Env = $this->AddVars($_ENV);
	break;

	case 'S';
	$this->Server = $this->AddVars($_SERVER);
	break;

	case 'F';
	$this->convertFiles();
	$this->Files = $this->MergeVars($_FILES, false); //do not strip slashes!
	break;
	}
	}

	// $this->AfterInit();
	}

	/**
	* Allow POST variables, that names were transformed by PHP ("." replaced with "_") to
	* override variables, that were virtually created through enviroment variable parsing
	*
	*/
	function _processPostEnvVariables()
	{
	$passed = $this->Get('passed');
	if (!$passed) {
	return ;
	}

	$passed = explode(',', $passed);
	foreach ($passed as $prefix_special) {
	if (strpos($prefix_special, '.') === false) {
	continue;
	}

	list ($prefix, $special) = explode('.', $prefix_special);
	$query_map = $this->Application->EventManager->getQueryMap($prefix);
	$post_prefix_special = $prefix . '_' . $special;

	foreach ($query_map as $index => $var_name) {
	if (array_key_exists($post_prefix_special . '_' . $var_name, $this->Post)) {
	$this->Set($prefix_special . '_' . $var_name, $this->Post[$post_prefix_special . '_' . $var_name]);
	}
	}
	}
	}

	function AfterInit()
	{
	$rewrite_url = $this->Get('_mod_rw_url_');

	if ($this->Application->RewriteURLs() \|\| $rewrite_url) {
	// maybe call onafterconfigread here

	if (defined('DEBUG_MODE') && $this->Application->isDebugMode()) {
	$this->Application->Debugger->profileStart('url_parsing', 'Parsing <b>MOD_REWRITE</b> url');
	$this->processRewriteURL();
	$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>' . $this->Get('t') . '</b>)';
	$this->Application->Debugger->profileFinish('url_parsing', $description);
	}
	else {
	$this->processRewriteURL();
	}

	if ( !$rewrite_url && $this->rewriteRedirectRequired() ) {
	// rewrite url is missing (e.g. not a script from tools folder)
	$url_params = $this->getRedirectParams();

	// no idea about how to check, that given template require category to be passed with it, so pass anyway
	$url_params['pass_category'] = 1;
	$url_params['response_code'] = 301; // Moved Permanently

	$this->Application->Redirect('', $url_params);
	}
	}
	else {
	$this->Application->VerifyThemeId();
	$this->Application->VerifyLanguageId();
	}
	}

	/**
	* Checks, that non-rewrite url was visited and it's automatic rewrite is required
	*
	* @return bool
	*/
	function rewriteRedirectRequired()
	{
	$redirect_conditions = Array (
	!$this->Application->Session->IsHTTPSRedirect(), // not https <-> http redirect
	!$this->refererIsOurSite(), // referer doesn't match ssl path or non-ssl domain (same for site domains)
	!defined('GW_NOTIFY'), // not in payment gateway notification script
	preg_match('/[\/]{0,1}index.php[\/]{0,1}/', $_SERVER['PHP_SELF']), // "index.php" was visited
	$this->Get('t') != 'index', // not on index page
	);

	$perform_redirect = true;

	foreach ($redirect_conditions as $redirect_condition) {
	$perform_redirect = $perform_redirect && $redirect_condition;

	if (!$perform_redirect) {
	return false;
	}
	}

	return true;
	}

	/**
	* Checks, that referer is out site
	*
	* @return bool
	*/
	function refererIsOurSite()
	{
	if ( !array_key_exists('HTTP_REFERER', $_SERVER) ) {
	// no referer -> don't care what happens
	return false;
	}

	$site_helper =& $this->Application->recallObject('SiteHelper');
	/* @var $site_helper SiteHelper */

	$found = false;
	$http_referer = $_SERVER['HTTP_REFERER'];
	preg_match('/^(.?):\/\/(.?)(\/\|$)/', $http_referer, $regs); // 1 - protocol, 2 - domain

	if ($regs[1] == 'https') {
	$found = $site_helper->getDomainByName('SSLUrl', $http_referer) > 0;

	if (!$found) {
	// check if referer starts with our ssl url
	$ssl_url = $this->Application->ConfigValue('SSL_URL');
	$found = $ssl_url && preg_match('/^' . preg_quote($ssl_url, '/') . '/', $http_referer);
	}
	}
	else {
	$found = $site_helper->getDomainByName('DomainName', $regs[2]) > 0;

	if (!$found) {
	$found = $regs[2] == DOMAIN;
	}
	}

	return $found;
	}

	function convertFiles()
	{
	if (!$_FILES)
	{
	return false;
	}

	$file_keys = Array('error','name','size','tmp_name','type');

	$tmp = Array();
	foreach($_FILES as $file_name => $file_info)
	{
	if( is_array($file_info['error']) )
	{
	$tmp[$file_name] = $this->getArrayLevel( $file_info['error'], $file_name );
	}
	else
	{
	$normal_files[$file_name] = $file_info;
	}
	}

	if(!$tmp) return false;

	$files = $_FILES;
	$_FILES = Array();

	foreach($tmp as $prefix => $prefix_files)
	{
	$anchor =& $_FILES;
	foreach($prefix_files['keys'] as $key)
	{
	$anchor =& $anchor[$key];
	}
	foreach($prefix_files['value'] as $field_name)
	{
	unset($inner_anchor);
	unset($copy);
	$work_copy = $prefix_files['keys'];
	foreach($file_keys as $file_key)
	{
	$inner_anchor =& $files[$prefix][$file_key];
	if (isset($copy))
	{
	$work_copy = $copy;
	}
	else
	{
	$copy = $work_copy;
	}
	array_shift($work_copy);
	foreach($work_copy as $prefix_file_key)
	{
	$inner_anchor =& $inner_anchor[$prefix_file_key];
	}
	$anchor[$field_name][$file_key] = $inner_anchor[$field_name];
	}
	}
	}

	// keys: img_temp, 0, values: LocalPath, ThumbPath
	}

	function getArrayLevel(&$level, $prefix='')
	{
	$ret['keys'] = $prefix ? Array($prefix) : Array();
	$ret['value'] = Array();

	foreach($level as $level_key => $level_value)
	{
	if( is_array($level_value) )
	{
	$ret['keys'][] = $level_key;
	$tmp = $this->getArrayLevel($level_value);

	$ret['keys'] = array_merge($ret['keys'], $tmp['keys']);
	$ret['value'] = array_merge($ret['value'], $tmp['value']);
	}
	else
	{
	$ret['value'][] = $level_key;
	}
	}

	return $ret;
	}

	/**
	* Owerwrites GET events with POST events in case if they are set and not empty
	*
	*/
	function convertPostEvents()
	{
	$events = $this->Get('events');
	if (is_array($events)) {
	foreach ($events as $prefix_special => $event_name) {
	if ($event_name) {
	$this->Set($prefix_special.'_event', $event_name);
	}
	}
	}
	}

	function finalizeParsing($passed = Array(), $module_params = Array() )
	{
	if ($passed) {
	$event_manger =& $this->Application->recallObject('EventManager');
	foreach ($passed as $passed_prefix) {
	$event_manger->setQueryMap($passed_prefix);
	}
	$this->Set('passed', implode(',', array_keys($event_manger->queryMaps)));
	}

	// get joined version (env var + mod rewrite parsed)
	$passed = $this->Application->GetVar('passed');

	if (!array_key_exists('editing_mode', $module_params)) {
	$module_params['editing_mode'] = '';
	}

	$module_params['__URLENCODE__'] = 1;

	$env = $this->Application->BuildEnv( $this->Get('t'), $module_params, $passed, false, false);
	$this->Set(ENV_VAR_NAME, $env);
	$_REQUEST['env'] = $_GET['env'] = $env; // for capability with old in-portal code
	}

	function processRewriteURL()
	{
	$mod_rw_helper =& $this->Application->recallObject('ModRewriteHelper');
	$mod_rw_helper->processRewriteURL();
	}

	function getDefaultTemplate($t)
	{
	$t = $this->getTemplateName( trim($t, '/') );
	if (!$t) $t = 'index';
	return trim($t, '/');
	}

	function extractSIDAndTemplate(&$parts)
	{
	$vars = Array ();
	$sub_parts = array_shift($parts);

	list ($sid, $t) = explode('-', $sub_parts, 2);

	if ($sid) {
	// Save Session ID
	$this->Set('sid', $sid);
	$vars['sid'] = $sid;
	}

	// Save Template Name
	$vars['t'] = $this->getDefaultTemplate($t);

	return $vars;
	}

	/**
	* Process QueryString only, create
	* events, ids, based on config
	* set template name and sid in
	* desired application variables.
	*
	* @param string $env_var enviroment string value
	*
	* @access public
	*/
	function processQueryString($env_var, $pass_name = 'passed')
	{
	// env=SID:TEMPLATE:m-1-1-1-1:l0-0-0:n-0-0-0:bb-0-0-1-1-1-0
	$vars = Array ();
	if ($env_var) {
	$more_vars = strpos($env_var, '&');
	if ($more_vars !== false) {
	parse_str(substr($env_var, $more_vars + 1), $vars);
	$env_var = substr($env_var, 0, $more_vars);
	}

	// replace escaped ":" symbol not to explode by it
	$env_var = str_replace('\:','_&+$$+&_', $env_var); // replace escaped "=" with spec-chars :)
	$parts = explode(':', $env_var);

	if (!$this->Application->RewriteURLs() \|\| ($this->Application->RewriteURLs() && $this->Get('rewrite') != 'on')) {
	$vars = array_merge_recursive2($vars, $this->extractSIDAndTemplate($parts));
	}

	if ($parts) {
	$passed = Array ();
	foreach ($parts as $mixed_part) {
	list ($passed[], $processed_vars) = $this->_parseEnvPart($mixed_part);
	$vars = array_merge_recursive2($vars, $processed_vars);
	}

	$vars[$pass_name] = implode(',', array_unique($passed));
	}
	}
	else {
	$t = $this->getTemplateName('index');
	$vars['t'] = $t;
	}

	return $vars;
	}

	/**
	* Converts enviroment part into variable array (based on query map for given prefix)
	*
	* @param string $mixed_part
	* @return Array
	*/
	function _parseEnvPart($mixed_part)
	{
	// In-portal old style env conversion - adds '-' between prefix and first var
	$mixed_part = str_replace('_&+$$+&_', ':', $mixed_part);
	$mixed_part = preg_replace("/^([a-zA-Z]+)([0-9]+)-(.*)/", "$1-$2-$3", $mixed_part);

	// replace escaped "-" symbol not to explode by it
	$escaped_part = str_replace('\-', '_&+$$+&_', $mixed_part);
	$escaped_part = explode('-', $escaped_part);

	$mixed_part = Array();
	foreach ($escaped_part as $escaped_val) {
	$mixed_part[] = str_replace('_&+$$+&_', '-', $escaped_val);
	}

	$prefix_special = array_shift($mixed_part); // l.pick, l
	$query_map = $this->Application->EventManager->setQueryMap($prefix_special);

	$vars = Array ();

	// if config is not defined for prefix in QueryString, then don't process it
	if ($query_map) {
	foreach ($query_map as $index => $var_name) {
	// l_id, l_page, l_bla-bla-bla
	$val = $mixed_part[$index - 1];
	if ($val == '') $val = false;
	$vars[$prefix_special.'_'.$var_name] = $val;
	}
	}

	return Array ($prefix_special, $vars);
	}

	/**
	* Removes tpl part from template name + resolved template ID to name
	*
	* @param string $t
	* @return string
	* @access private
	*/
	function getTemplateName($t)
	{
	if (array_key_exists('t', $this->Get) && $this->Get['t']) {
	// template name is passed directly in url (GET method)
	$t = $this->Get['t'];
	}

	// if t was set through env, even in mod_rewrite mode!
	if ($this->Get('env') && $this->Application->RewriteURLs() && $this->Get('t')) {
	$t = $this->Get('t');
	}

	return preg_replace('/\.tpl$/', '', $t);
	}

	/**
	* Saves variables from array specified
	* into common variable storage place
	*
	* @param Array $array
	* @return Array
	* @access private
	*/
	function AddVars($array)
	{
	$array = $this->StripSlashes($array);
	foreach($array as $key => $value)
	{
	$this->Set($key,$value);
	}
	return $array;
	}

	function MergeVars($array, $strip_slashes=true)
	{
	if ($strip_slashes) $array = $this->StripSlashes($array);
	foreach($array as $key => $value)
	{
	$this->_Params = array_merge_recursive2($this->_Params, Array($key=>$value));
	}
	return $array;
	}

	function StripSlashes($array)
	{
	static $magic_quotes = null;

	if (!isset($magic_quotes)) {
	$magic_quotes = get_magic_quotes_gpc();
	}

	foreach ($array as $key => $value) {
	if (is_array($value)) {
	$array[$key] = $this->StripSlashes($value);
	}
	else {
	if ($magic_quotes) {
	$value = stripslashes($value);
	}

	if (!$this->Application->isAdmin) {
	$value = htmlspecialchars($value);
	}

	$array[$key] = $value;
	}
	}

	return $array;
	}

	/**
	* Returns all $_GET array excluding system parameters, that are not allowed to be passed through generated urls
	*
	* @param bool $access_error Method is called during no_permission, require login, session expiration link preparation
	* @return Array
	*/
	function getRedirectParams($access_error = false)
	{
	$vars = $this->Get;
	$unset_vars = Array (ENV_VAR_NAME, 'rewrite', '_mod_rw_url_', 'Action');

	if (!$this->_sidInQueryString) {
	$unset_vars[] = 'sid';
	}

	// remove system variables
	foreach ($unset_vars as $var_name) {
	if (array_key_exists($var_name, $vars)) {
	unset($vars[$var_name]);
	}
	}

	if ($access_error) {
	// place 1 of 2 (also in UsersEventHandler::OnSessionExpire)
	$vars = $this->_removePassThroughVariables($vars);
	}

	// transform arrays
	return $this->_transformArrays($vars);
	}

	/**
	* Removes all pass_though variables from redirect params
	*
	* @param Array $url_params
	* @return Array
	*/
	function _removePassThroughVariables($url_params)
	{
	$pass_through = array_key_exists('pass_through', $url_params) ? $url_params['pass_through'] : '';
	if (!$pass_through) {
	return $url_params;
	}

	$pass_through = explode(',', $pass_through . ',pass_through');
	foreach ($pass_through as $pass_through_var) {
	unset($url_params[$pass_through_var]);
	}

	$url_params['no_pass_through'] = 1; // this way kApplication::HREF won't add them again

	return $url_params;
	}

	function _transformArrays($array, $level_prefix = '')
	{
	$ret = Array ();
	foreach ($array as $var_name => $var_value) {
	$new_var_name = $level_prefix ? $level_prefix . '[' . $var_name . ']' : $var_name;

	if (is_array($var_value)) {
	$ret = array_merge($ret, $this->_transformArrays($var_value, $new_var_name));
	}
	else {
	$ret[$new_var_name] = $var_value;
	}
	}

	return $ret;
	}

	function writeRequestLog($filename)
	{
	$folder_path = dirname(FULL_PATH.'/'.$filename);
	if (is_writable($folder_path)) {
	$fp = fopen(FULL_PATH.'/'.$filename, 'a');
	if ($fp) {
	$session =& $this->Application->recallObject('Session');
	$user_id = $session->GetField('PortalUserId');
	$admin_mark = $this->Application->isAdmin ? 'ADMIN' : 'FRONT';

	$data = '['.date('D M d H:i:s Y').'] '.$admin_mark.'; ip: '.$_SERVER['REMOTE_ADDR'].'; user_id: '.$user_id.'; sid: '.$this->Application->GetSID().'; request: '."\n";
	if ($this->Get) {
	$data .= "_GET:\n".print_r($this->Get, true);
	}

	if ($this->Post) {
	$data .= "_POST:\n".print_r($this->Post, true);
	}

	if ($this->Cookie) {
	$data .= "_COOKIE:\n".print_r($this->Cookie, true);
	}
	$data .= str_repeat('=', 100)."\n";

	fwrite($fp, $data);
	fclose($fp);
	}
	else {
	trigger_error('Requrest Log directory not writable', E_USER_WARNING);
	}
	}
	else {
	trigger_error('Requrest Log directory not writable', E_USER_WARNING);
	}
	}

	}
	\ No newline at end of file
	Index: branches/5.1.x/core/kernel/globals.php
	===================================================================
	--- branches/5.1.x/core/kernel/globals.php (revision 14324)
	+++ branches/5.1.x/core/kernel/globals.php (revision 14325)
	@@ -1,752 +1,756 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
	* @license GNU/GPL
	* In-Portal is Open Source software.
	* This means that this software may have been modified pursuant
	* the GNU General Public License, and as distributed it includes
	* or is derivative of works licensed under the GNU General Public License
	* or other free or open source software licenses.
	* See http://www.in-portal.org/license for copyright notices and details.
	*/

	defined('FULL_PATH') or die('restricted access!');

	if( !function_exists('array_merge_recursive2') ) {
	/**
	* array_merge_recursive2()
	*
	* Similar to array_merge_recursive but keyed-valued are always overwritten.
	* Priority goes to the 2nd array.
	*
	* @static yes
	* @param $paArray1 array
	* @param $paArray2 array
	* @return array
	* @access public
	*/
	function array_merge_recursive2($paArray1, $paArray2)
	{
	if (!is_array($paArray1) or !is_array($paArray2)) { return $paArray2; }
	foreach ($paArray2 AS $sKey2 => $sValue2)
	{
	$paArray1[$sKey2] = isset($paArray1[$sKey2]) ? array_merge_recursive2($paArray1[$sKey2], $sValue2) : $sValue2;
	// $paArray1[$sKey2] = array_merge_recursive2( getArrayValue($paArray1,$sKey2), $sValue2);
	}
	return $paArray1;
	}
	}

	/**
	* @return int
	* @param $array array
	* @param $value mixed
	* @desc Prepend a reference to an element to the beginning of an array. Renumbers numeric keys, so $value is always inserted to $array[0]
	*/
	function array_unshift_ref(&$array, &$value)
	{
	$return = array_unshift($array,'');
	$array[0] =& $value;
	return $return;
	}

	/**
	* Same as print_r, budet designed for viewing in web page
	*
	* @param Array $data
	* @param string $label
	*/
	function print_pre($data, $label='', $on_screen = false)
	{
	$is_debug = false;
	if (class_exists('kApplication') && !$on_screen) {
	$application =& kApplication::Instance();
	$is_debug = $application->isDebugMode();
	}

	if ($is_debug) {
	if ($label) $application->Debugger->appendHTML('<b>'.$label.'</b>');
	$application->Debugger->dumpVars($data);
	}
	else
	{
	if ($label) echo '<b>', $label, '</b><br>';
	echo '<pre>', print_r($data, true), '</pre>';
	}
	}

	/**
	* Returns array value if key exists
	*
	* @param Array $array searchable array
	* @param int $key array key
	* @return string
	* @access public
	*/
	//
	function getArrayValue(&$array, $key)
	{
	// global $debugger;
	// if (is_object($debugger)) $debugger->ProfilePoint('getArrayValue', 1);
	$ret = isset($array[$key]) ? $array[$key] : false;
	if ($ret && func_num_args() > 2) {
	for ($i = 2; $i < func_num_args(); $i++) {
	$cur_key = func_get_arg($i);
	$ret = getArrayValue( $ret, $cur_key );
	if ($ret === false) break;
	}
	}
	return $ret;
	}

	/**
	* Rename key in associative array, maintaining keys order
	*
	* @param Array $array Associative Array
	* @param mixed $old Old key name
	* @param mixed $new New key name
	* @access public
	*/
	function array_rename_key(&$array, $old, $new)
	{
	$new_array = Array ();
	foreach ($array as $key => $val) {
	$new_array[ $key == $old ? $new : $key] = $val;
	}

	$array = $new_array;
	}

	/**
	* Define constant if it was not already defined before
	*
	* @param string $const_name
	* @param string $const_value
	* @access public
	*/
	function safeDefine($const_name, $const_value)
	{
	if(!defined($const_name)) define($const_name,$const_value);
	}

	function parse_portal_ini($parse_section = false)
	{
	$file = FULL_PATH . DIRECTORY_SEPARATOR . 'system' . DIRECTORY_SEPARATOR . 'config.php';

	if (!file_exists($file)) {
	return Array ();
	}

	if (file_exists($file) && !is_readable($file)) {
	die('Could Not Open Ini File');
	}

	$contents = file($file);

	if ($contents && $contents[0] == '<' . '?' . 'php die() ?' . ">\n") {
	// format of "config.php" file before 5.1.0 version
	array_shift($contents);

	return parse_ini_string(implode('', $contents), $parse_section);
	}

	$_CONFIG = Array ();
	require($file);

	if ($parse_section) {
	return $_CONFIG;
	}

	$ret = Array ();

	foreach ($_CONFIG as $section => $section_variables) {
	$ret = array_merge($ret, $section_variables);
	}

	return $ret;
	}

	if ( !function_exists('parse_ini_string') ) {
	/**
	* Equivalent for "parse_ini_string" function available since PHP 5.3.0
	*
	* @param string $ini
	* @param bool $process_sections
	* @param int $scanner_mode
	* @return Array
	*/
	function parse_ini_string($ini, $process_sections = false, $scanner_mode = null)
	{
	# Generate a temporary file.
	$tempname = tempnam('/tmp', 'ini');
	$fp = fopen($tempname, 'w');
	fwrite($fp, $ini);
	$ini = parse_ini_file($tempname, !empty($process_sections));
	fclose($fp);
	@unlink($tempname);

	return $ini;
	}
	}

	if( !function_exists('getmicrotime') )
	{
	function getmicrotime()
	{
	list($usec, $sec) = explode(" ",microtime());
	return ((float)$usec + (float)$sec);
	}
	}

	if( !function_exists('k4_include_once') )
	{
	function k4_include_once($file)
	{
	global $debugger;
	if ( defined('DEBUG_MODE') && DEBUG_MODE && isset($debugger) && constOn('DBG_PROFILE_INCLUDES') )
	{

	if ( in_array($file, get_required_files()) ) return;
	global $debugger;

	/* $debugger->IncludeLevel++;
	$before_mem = memory_get_usage();
	*/
	$debugger->ProfileStart('inc_'.crc32($file), $file);
	include_once($file);
	$debugger->ProfileFinish('inc_'.crc32($file));
	$debugger->profilerAddTotal('includes', 'inc_'.crc32($file));

	/* $used_mem = memory_get_usage() - $before_mem;
	$debugger->IncludeLevel--;
	$debugger->IncludesData['file'][] = str_replace(FULL_PATH, '', $file);
	$debugger->IncludesData['mem'][] = $used_mem;
	$debugger->IncludesData['time'][] = $used_time;
	$debugger->IncludesData['level'][] = $debugger->IncludeLevel;
	*/

	}
	else
	{
	include_once($file);
	}
	}
	}

	/**
	* Checks if string passed is serialized array
	*
	* @param string $string
	* @return bool
	*/
	function IsSerialized($string)
	{
	if( is_array($string) ) return false;
	return preg_match('/a:([\d]+):{/', $string);
	}

	if (!function_exists('makepassword4')){

	function makepassword4($length=10)
	{
	$pass_length=$length;

	$p1=array('b','c','d','f','g','h','j','k','l','m','n','p','q','r','s','t','v','w','x','y','z');
	$p2=array('a','e','i','o','u');
	$p3=array('1','2','3','4','5','6','7','8','9');
	$p4=array('(','&',')',';','%'); // if you need real strong stuff

	// how much elements in the array
	// can be done with a array count but counting once here is faster

	$s1=21;// this is the count of $p1
	$s2=5; // this is the count of $p2
	$s3=9; // this is the count of $p3
	$s4=5; // this is the count of $p4

	// possible readable combinations

	$c1='121'; // will be like 'bab'
	$c2='212'; // will be like 'aba'
	$c3='12'; // will be like 'ab'
	$c4='3'; // will be just a number '1 to 9' if you dont like number delete the 3
	// $c5='4'; // uncomment to active the strong stuff

	$comb='4'; // the amount of combinations you made above (and did not comment out)

	for ($p=0;$p<$pass_length;)
	{
	mt_srand((double)microtime()*1000000);
	$strpart=mt_rand(1,$comb);
	// checking if the stringpart is not the same as the previous one
	if($strpart<>$previous)
	{
	$pass_structure.=${'c'.$strpart};

	// shortcutting the loop a bit
	$p=$p+mb_strlen(${'c'.$strpart});
	}
	$previous=$strpart;
	}


	// generating the password from the structure defined in $pass_structure
	for ($g=0;$g<mb_strlen($pass_structure);$g++)
	{
	mt_srand((double)microtime()*1000000);
	$sel=mb_substr($pass_structure,$g,1);
	$pass.=${'p'.$sel}[mt_rand(0,-1+${'s'.$sel})];

	}
	return $pass;
	}
	}

	if( !function_exists('unhtmlentities') )
	{
	function unhtmlentities($string)
	{
	$trans_tbl = get_html_translation_table(HTML_ENTITIES);
	$trans_tbl = array_flip ($trans_tbl);
	return strtr($string, $trans_tbl);
	}
	}

	if( !function_exists('curl_post') )
	{
	/**
	* submits $url with $post as POST
	*
	* @param string $url
	* @param unknown_type $post
	* @return unknown
	*/
	function curl_post($url, $post, $headers=null, $request_type = 'POST', $curl_options=null)
	{
	if( is_array($post) )
	{
	$params_str = '';
	foreach($post as $key => $value) $params_str .= $key.'='.urlencode($value).'&';
	$post = $params_str;
	}

	$ch = curl_init($url);

	$dbg = false;
	if (defined('DEBUG_MODE') && DEBUG_MODE && constOn('DBG_CURL')) {
	$dbg = true;
	safeDefine('DBG_CURL_LOGFILE', '/curl.log');
	$log = fopen(FULL_PATH.DBG_CURL_LOGFILE, 'a');

	curl_setopt($ch, CURLOPT_FILE, $log);
	curl_setopt($ch, CURLOPT_VERBOSE, TRUE);
	curl_setopt($ch, CURLOPT_STDERR, $log);
	//curl_setopt($ch, CURLOPT_WRITEHEADER, $log);
	}

	if (!is_null($headers)) {
	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
	}

	// if we have post data, then POST else use GET method instead
	if ($request_type == 'POST') {
	curl_setopt($ch, CURLOPT_POST, 1);
	curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
	}
	elseif ($request_type == 'GET' && isset($post) && strlen($post) > 0) {
	curl_setopt($ch, CURLOPT_URL, preg_match('/\?/', $url) ? $url.'&'.$post : $url.'?'.$post);
	}

	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

	curl_setopt($ch,CURLOPT_REFERER, PROTOCOL.SERVER_NAME);
	- curl_setopt($ch,CURLOPT_USERAGENT,$_SERVER['HTTP_USER_AGENT']);
	+
	+ if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
	+ curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
	+ }
	+
	curl_setopt($ch,CURLOPT_FOLLOWLOCATION, 0);
	curl_setopt($ch, CURLOPT_TIMEOUT, 90);

	if (is_array($curl_options)) {
	foreach ($curl_options as $option => $value) {
	curl_setopt($ch, $option, $value);
	}
	}
	$ret = curl_exec($ch);
	$GLOBALS['curl_errorno'] = curl_errno($ch);
	$GLOBALS['curl_error'] = curl_error($ch);
	curl_close($ch);

	if ($dbg) {
	fwrite($log, "\n".$ret);
	fclose($log);
	}

	return $ret;
	}
	}

	if( !function_exists('memory_get_usage') )
	{
	function memory_get_usage(){ return -1; }
	}

	function &ref_call_user_func_array($callable, $args)
	{
	if( is_scalar($callable) )
	{
	// $callable is the name of a function
	$call = $callable;
	}
	else
	{
	if( is_object($callable[0]) )
	{
	// $callable is an object and a method name
	$call = "\$callable[0]->{$callable[1]}";
	}
	else
	{
	// $callable is a class name and a static method
	$call = "{$callable[0]}::{$callable[1]}";
	}
	}

	// Note because the keys in $args might be strings
	// we do this in a slightly round about way.
	$argumentString = Array();
	$argumentKeys = array_keys($args);
	foreach($argumentKeys as $argK)
	{
	$argumentString[] = "\$args[$argumentKeys[$argK]]";
	}
	$argumentString = implode($argumentString, ', ');
	// Note also that eval doesn't return references, so we
	// work around it in this way...
	eval("\$result =& {$call}({$argumentString});");
	return $result;
	}

	/**
	* Checks if constant is defined and has positive value
	*
	* @param string $const_name
	* @return bool
	*/
	function constOn($const_name)
	{
	return defined($const_name) && constant($const_name);
	}

	function Kg2Pounds($kg, $pounds_only = false)
	{
	$major = floor( round($kg / POUND_TO_KG, 3) );
	$minor = abs(round(($kg - $major * POUND_TO_KG) / POUND_TO_KG * 16, 2));
	if ($pounds_only) {
	$major += round($minor * 0.0625, 2);
	$minor = 0;
	}
	return array($major, $minor);
	}

	function Pounds2Kg($pounds, $ounces=0)
	{
	return round(($pounds + ($ounces / 16)) * POUND_TO_KG, 5);
	}

	/**
	* Formats file/memory size in nice way
	*
	* @param int $bytes
	* @return string
	* @access public
	*/
	function formatSize($bytes)
	{
	if ($bytes >= 1099511627776) {
	$return = round($bytes / 1024 / 1024 / 1024 / 1024, 2);
	$suffix = "TB";
	} elseif ($bytes >= 1073741824) {
	$return = round($bytes / 1024 / 1024 / 1024, 2);
	$suffix = "GB";
	} elseif ($bytes >= 1048576) {
	$return = round($bytes / 1024 / 1024, 2);
	$suffix = "MB";
	} elseif ($bytes >= 1024) {
	$return = round($bytes / 1024, 2);
	$suffix = "KB";
	} else {
	$return = $bytes;
	$suffix = "Byte";
	}
	$return .= ' '.$suffix;
	return $return;
	}

	/**
	* Enter description here...
	*
	* @param resource $filePointer the file resource to write to
	* @param Array $data the data to write out
	* @param string $delimiter the field separator
	* @param string $enclosure symbol to enclose field data to
	* @param string $recordSeparator symbols to separate records with
	*/
	function fputcsv2($filePointer, $data, $delimiter = ',', $enclosure = '"', $recordSeparator = "\r\n")
	{
	foreach($data as $field_index => $field_value) {
	// replaces an enclosure with two enclosures
	$data[$field_index] = str_replace($enclosure, $enclosure.$enclosure, $field_value);
	}

	$line = $enclosure.implode($enclosure.$delimiter.$enclosure, $data).$enclosure.$recordSeparator;
	$line = preg_replace('/'.preg_quote($enclosure, '/').'([0-9\.]+)'.preg_quote($enclosure, '/').'/', '$1', $line);
	fwrite($filePointer, $line);
	}

	/**
	* Enter description here...
	*
	* @param resource $filePointer the file resource to write to
	* @param Array $data the data to write out
	* @param string $delimiter the field separator
	* @param string $enclosure symbol to enclose field data to
	* @param string $recordSeparator symbols to separate records with
	*/
	function getcsvline($data, $delimiter = ',', $enclosure = '"', $recordSeparator = "\r\n")
	{
	foreach($data as $field_index => $field_value) {
	// replaces an enclosure with two enclosures
	$data[$field_index] = str_replace($enclosure, $enclosure.$enclosure, $field_value);
	}
	$line = $enclosure.implode($enclosure.$delimiter.$enclosure, $data).$enclosure.$recordSeparator;
	$line = preg_replace('/'.preg_quote($enclosure, '/').'([0-9\.]+)'.preg_quote($enclosure, '/').'/', '$1', $line);
	return $line;
	}
	/**
	* Allows to replace #section# within any string with current section
	*
	* @param string $string
	* @return string
	*/
	function replaceModuleSection($string)
	{
	$application =& kApplication::Instance();
	$module_section = $application->RecallVar('section');
	if ($module_section) {
	// substitute section instead of #section# parameter in title preset name
	$module_section = explode(':', $module_section);
	$section = preg_replace('/(configuration\|configure)_(.*)/i', '\\2', $module_section[count($module_section) == 2 ? 1 : 0]);
	$string = str_replace('#section#', mb_strtolower($section), $string);
	}
	return $string;
	}

	/**
	* Checks, that user IP address is within allowed range
	*
	* @param string $ip_list semi-column (by default) separated ip address list
	* @param string $separator ip address separator (default ";")
	*
	* @return bool
	*/
	function ipMatch($ip_list, $separator = ';')
	{
	if ( !isset($_SERVER['REMOTE_ADDR']) ) {
	return false;
	}

	$ip_match = false;
	$ip_addresses = $ip_list ? explode($separator, $ip_list) : Array ();
	foreach ($ip_addresses as $ip_address) {
	if (netMatch($ip_address, $_SERVER['REMOTE_ADDR'])) {
	$ip_match = true;
	break;
	}
	}

	return $ip_match;
	}

	function netMatch($network, $ip)
	{
	$network = trim($network);
	$ip = trim($ip);

	if ($network == $ip) {
	// comparing two ip addresses directly
	return true;
	}

	$d = strpos($network, '-');
	if ($d !== false) {
	// ip address range specified
	$from = ip2long(trim(substr($network, 0, $d)));
	$to = ip2long(trim(substr($network, $d + 1)));

	$ip = ip2long($ip);
	return ($ip >= $from && $ip <= $to);
	}
	elseif (strpos($network, '/') !== false) {
	// sigle subnet specified
	$ip_arr = explode('/', $network);

	if (!preg_match("@\d\.\d\.\d\.\d@", $ip_arr[0], $matches)) {
	$ip_arr[0] .= '.0'; // Alternate form 194.1.4/24
	}

	$network_long = ip2long($ip_arr[0]);
	$x = ip2long($ip_arr[1]);

	$mask = long2ip($x) == $ip_arr[1] ? $x : (0xffffffff << (32 - $ip_arr[1]));
	$ip_long = ip2long($ip);

	return ($ip_long & $mask) == ($network_long & $mask);
	}

	return false;
	}

	function request_headers()
	{
	if(function_exists("apache_request_headers")) // If apache_request_headers() exists...
	{
	if($headers = apache_request_headers()) // And works...
	{
	return $headers; // Use it
	}
	}

	$headers = array();

	foreach(array_keys($_SERVER) as $skey)
	{
	if(substr($skey, 0, 5) == "HTTP_")
	{
	$headername = str_replace(" ", "-", ucwords(strtolower(str_replace("_", " ", substr($skey, 0, 5)))));
	$headers[$headername] = $_SERVER[$skey];
	}
	}

	return $headers;
	}

	if (!function_exists('easter_date')) {
	// calculates easter date, when calendar extension not installed in php
	// see also: http://php.prod.intechnic.lv/manual/en/function.easter-date.php
	function easter_date ($Year) {
	/*
	G is the Golden Number-1
	H is 23-Epact (modulo 30)
	I is the number of days from 21 March to the Paschal full moon
	J is the weekday for the Paschal full moon (0=Sunday,
	1=Monday, etc.)
	L is the number of days from 21 March to the Sunday on or before
	the Paschal full moon (a number between -6 and 28)
	*/


	$G = $Year % 19;
	$C = (int)($Year / 100);
	$H = (int)($C - ($C / 4) - ((8$C+13) / 25) + 19$G + 15) % 30;
	$I = (int)$H - (int)($H / 28)(1 - (int)($H / 28)(int)(29 / ($H + 1))*((int)(21 - $G) / 11));
	$J = ($Year + (int)($Year/4) + $I + 2 - $C + (int)($C/4)) % 7;
	$L = $I - $J;
	$m = 3 + (int)(($L + 40) / 44);
	$d = $L + 28 - 31 * ((int)($m / 4));
	$y = $Year;
	$E = mktime(0,0,0, $m, $d, $y);

	return $E;
	}
	}

	if (!function_exists('imagecreatefrombmp')) {
	// just in case if GD will add this function in future
	function imagecreatefrombmp($filename)
	{
	//Ouverture du fichier en mode binaire
	if (! $f1 = fopen($filename,"rb")) return FALSE;

	//1 : Chargement des ent�tes FICHIER
	$FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
	if ($FILE['file_type'] != 19778) return FALSE;

	//2 : Chargement des ent�tes BMP
	$BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
	'/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
	'/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40));
	$BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
	if ($BMP['size_bitmap'] == 0) $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
	$BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
	$BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
	$BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
	$BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
	$BMP['decal'] = 4-(4*$BMP['decal']);
	if ($BMP['decal'] == 4) $BMP['decal'] = 0;

	//3 : Chargement des couleurs de la palette
	$PALETTE = array();
	if ($BMP['colors'] < 16777216)
	{
	$PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
	}

	//4 : Cr�ation de l'image
	$IMG = fread($f1,$BMP['size_bitmap']);
	$VIDE = chr(0);

	$res = imagecreatetruecolor($BMP['width'],$BMP['height']);
	$P = 0;
	$Y = $BMP['height']-1;
	while ($Y >= 0)
	{
	$X=0;
	while ($X < $BMP['width'])
	{
	if ($BMP['bits_per_pixel'] == 24)
	$COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
	elseif ($BMP['bits_per_pixel'] == 16)
	{
	$COLOR = unpack("n",substr($IMG,$P,2));
	$COLOR[1] = $PALETTE[$COLOR[1]+1];
	}
	elseif ($BMP['bits_per_pixel'] == 8)
	{
	$COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
	$COLOR[1] = $PALETTE[$COLOR[1]+1];
	}
	elseif ($BMP['bits_per_pixel'] == 4)
	{
	$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
	if (($P*2)%2 == 0) $COLOR[1] = ($COLOR[1] >> 4) ; else $COLOR[1] = ($COLOR[1] & 0x0F);
	$COLOR[1] = $PALETTE[$COLOR[1]+1];
	}
	elseif ($BMP['bits_per_pixel'] == 1)
	{
	$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
	if (($P*8)%8 == 0) $COLOR[1] = $COLOR[1] >>7;
	elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
	elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
	elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
	elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
	elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
	elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
	elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
	$COLOR[1] = $PALETTE[$COLOR[1]+1];
	}
	else
	return FALSE;
	imagesetpixel($res,$X,$Y,$COLOR[1]);
	$X++;
	$P += $BMP['bytes_per_pixel'];
	}
	$Y--;
	$P+=$BMP['decal'];
	}

	//Fermeture du fichier
	fclose($f1);

	return $res;
	}
	}
	\ No newline at end of file
	Index: branches/5.1.x/core/units/helpers/curl_helper.php
	===================================================================
	--- branches/5.1.x/core/units/helpers/curl_helper.php (revision 14324)
	+++ branches/5.1.x/core/units/helpers/curl_helper.php (revision 14325)
	@@ -1,292 +1,295 @@
	<?php
	/**
	* @version $Id$
	* @package In-Portal
	* @copyright Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
	* @license GNU/GPL
	* In-Portal is Open Source software.
	* This means that this software may have been modified pursuant
	* the GNU General Public License, and as distributed it includes
	* or is derivative of works licensed under the GNU General Public License
	* or other free or open source software licenses.
	* See http://www.in-portal.org/license for copyright notices and details.
	*/

	defined('FULL_PATH') or die('restricted access!');

	class kCurlHelper extends kHelper {

	/**
	* Connection to host
	*
	* @var resource
	*/
	var $connectionID = null;

	/**
	* Pointer to opened log file
	*
	* @var resource
	*/
	var $logFilePointer = null;

	/**
	* Responce waiting timeout
	*
	* @var int
	*/
	var $timeout = 90;

	/**
	* Follow to url, if redirect received insted of document (only works when open_basedir and safe mode is off)
	*
	* @var bool
	*/
	var $followLocation = false;

	/**
	* Last responce received by Curl
	*
	* @var string
	*/
	var $lastRespoce = '';

	/**
	* Last error code
	*
	* @var int
	*/
	var $lastErrorCode = 0;

	/**
	* Last error message
	*
	* @var string
	*/
	var $lastErrorMsg = '';

	/**
	* Most recent HTTP responce code received
	*
	* @var int
	*/
	var $lastHTTPCode = 0;

	/**
	* POST data to be sent using curl
	*
	* @var string
	*/
	var $postData = '';

	var $requestHeaders = Array ();

	var $responceHeaders = Array ();

	var $options = Array ();

	/**
	* Indicates debug mode status
	*
	* @var bool
	*/
	var $debugMode = false;

	function kCurlHelper()
	{
	parent::kHelper();

	$this->debugMode = constOn('DBG_CURL');
	}

	/**
	* Reset connection settings (not results) after connection was closed
	*
	*/
	function _resetSettings()
	{
	$this->timeout = 90;
	$this->followLocation = false;
	$this->postData = '';
	$this->requestHeaders = Array ();
	$this->options = Array ();
	}

	function setOptions($options_hash)
	{
	$this->options = array_merge_recursive2($this->options, $options_hash);
	}

	function prepareOptions()
	{
	if ($this->followLocation && ((defined('SAFE_MODE') && SAFE_MODE) \|\| ini_get('open_basedir'))) {
	// this won't work with such restrictions, so turn it off
	$this->followLocation = false;
	}

	$default_options = Array (
	// customizable options
	CURLOPT_FOLLOWLOCATION => $this->followLocation ? 1 : 0,
	CURLOPT_TIMEOUT => $this->timeout,

	// hardcoded options
	CURLOPT_RETURNTRANSFER => 1,
	CURLOPT_REFERER => PROTOCOL.SERVER_NAME,
	- CURLOPT_USERAGENT => $_SERVER['HTTP_USER_AGENT'],
	-
	+
	// don't verify SSL certificates
	CURLOPT_SSL_VERIFYPEER => false,
	CURLOPT_HTTPHEADER => Array ('Expect:'),
	);

	+ if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
	+ $default_options[CURLOPT_USERAGENT] = $_SERVER['HTTP_USER_AGENT'];
	+ }
	+
	if ($this->requestHeaders) {
	$default_options[CURLOPT_HTTPHEADER] = $this->prepareHeaders();
	}

	// if we have post data, then POST else use GET method instead
	if ($this->postData) {
	$default_options[CURLOPT_POST] = 1;
	$default_options[CURLOPT_POSTFIELDS] = $this->postData;
	}

	// $default_options[CURLOPT_HEADERFUNCTION] = Array(&$this, 'ParseHeader');

	$user_options = $this->options; // backup options, that user set directly
	$this->setOptions($default_options);
	$this->setOptions($user_options);
	$this->applyOptions();
	}

	function applyOptions()
	{
	foreach ($this->options as $option_name => $option_value) {
	curl_setopt($this->connectionID, $option_name, $option_value);
	}
	}

	function ParseHeader(&$ch, $header)
	{
	$this->responceHeaders[] = $header;
	return strlen($header);
	}

	/**
	* Sets POST data for next query
	*
	* @param mixed $post_data Array or string
	*/
	function SetPostData($post_data)
	{
	if (is_array($post_data)) {
	$post_data = $this->Application->HttpQuery->_transformArrays($post_data);

	$params_str = '';
	foreach ($post_data as $key => $value) {
	$params_str .= $key.'='.urlencode($value).'&';
	}
	$post_data = $params_str;
	}

	$this->postData = $post_data;
	}

	function SetHeaders($headers)
	{
	$this->requestHeaders = array_merge_recursive2($this->requestHeaders, $headers);
	}

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

	/**
	* Returns compiled header to be used by curl
	*
	* @return Array
	*/
	function prepareHeaders()
	{
	$ret = Array ();
	foreach ($this->requestHeaders as $header_name => $header_value) {
	$ret[] = $header_name.': '.$header_value;
	}
	return $ret;
	}

	function Send($url, $close_connection = true, $log_status = null)
	{
	if (isset($log_status)) {
	// override debug mode setting
	$this->debugMode = $log_status;
	}

	$this->connectionID = curl_init($url);

	if ($this->debugMode) {
	safeDefine('DBG_CURL_LOGFILE', '/curl.log');
	$this->logFilePointer = fopen(FULL_PATH.DBG_CURL_LOGFILE, 'a');

	$user_id = $this->Application->RecallVar('user_id');
	$data = $_SERVER['REMOTE_ADDR'] . ' - ['.adodb_date('D M d H:i:s Y').'] ' . $_SERVER['REQUEST_URI'] . '; user_id: '.$user_id.'; sid: '.$this->Application->GetSID();
	fwrite($this->logFilePointer, "\n\n" . str_repeat('=', strlen($data)) . "\n");
	fwrite($this->logFilePointer, $data);
	fwrite($this->logFilePointer, "\n" . str_repeat('=', strlen($data)) . "\n");

	curl_setopt($this->connectionID, CURLOPT_FILE, $this->logFilePointer);
	curl_setopt($this->connectionID, CURLOPT_VERBOSE, true);
	curl_setopt($this->connectionID, CURLOPT_STDERR, $this->logFilePointer);
	//curl_setopt($this->connectionID, CURLOPT_WRITEHEADER, $this->logFilePointer);
	}

	$this->responceHeaders = Array ();

	$this->prepareOptions();
	$this->lastRespoce = curl_exec($this->connectionID);

	$this->Finalize($close_connection);

	return $this->lastRespoce;
	}

	/**
	* Returns various info about request made
	*
	* @param int $info_type
	* @return mixed
	*
	* @see http://www.php.net/manual/ru/function.curl-getinfo.php
	*/
	function getInfo($info_type)
	{
	return curl_getinfo($this->connectionID, $info_type);
	}

	function Finalize($close_connection = true)
	{
	$this->lastErrorCode = curl_errno($this->connectionID);
	$this->lastErrorMsg = curl_error($this->connectionID);
	$this->lastHTTPCode = curl_getinfo($this->connectionID, CURLINFO_HTTP_CODE);

	if ($close_connection) {
	$this->CloseConnection();
	}

	$this->_resetSettings();
	}

	function CloseConnection()
	{
	curl_close($this->connectionID);

	if ($this->debugMode) {
	// only close log after curl resource has been terminated
	fwrite($this->logFilePointer, "\n" . 'LastHTTPCode: ' . $this->lastHTTPCode . '; LastError: #' . $this->lastErrorCode . ' (' . $this->lastErrorMsg . ')' . "\n");
	fwrite($this->logFilePointer, 'Respoce:' . "\n" . $this->lastRespoce);
	fclose($this->logFilePointer);
	}

	// restore debug mode setting
	$this->debugMode = constOn('DBG_CURL');
	}
	}
	\ No newline at end of file

in-portalNo OneTemporaryActions

File Metadata

in-portalView Options

Event Timeline

in-portal
No OneTemporary
Actions

in-portal
View Options