in-portal
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Thu, Jul 17, 6:43 PM

in-portal
View Options

	Index: trunk/kernel/include/emailmessage.php
	===================================================================
	--- trunk/kernel/include/emailmessage.php (revision 3619)
	+++ trunk/kernel/include/emailmessage.php (revision 3620)
	@@ -1,986 +1,986 @@
	<?php
	class clsEmailMessage extends clsParsedItem
	{
	var $Event = "";
	var $Item;
	var $headers = array();
	var $subject = "";
	var $body = "";
	var $TemplateParsed = FALSE;
	var $recipient = NULL;
	var $fromuser = NULL;

	function clsEmailMessage($MessageId=NULL,$Item=NULL)
	{
	$this->clsParsedItem();
	$this->tablename = GetTablePrefix()."EmailMessage";
	$this->Item = $Item;
	$this->BasePermission = "EMAIL";
	$this->id_field = "EmailMessageId";
	$this->TagPrefix = "email";
	$this->NoResourceId=1;
	if($MessageId)
	$this->LoadFromDatabase($MessageId);
	}

	function LoadEvent($event,$language=NULL)
	{
	global $objConfig, $objLanguages;

	if(!strlen($language))
	$language = $objLanguages->GetPrimary();
	$sql = "SELECT * FROM ".$this->tablename." WHERE EventId = $event AND LanguageId=$language";
	$rs = $this->adodbConnection->Execute($sql);
	if($rs && !$rs->EOF)
	{
	$data = $rs->fields;
	$this->SetFromArray($data);
	$this->Clean();
	return TRUE;
	}
	else
	return FALSE;
	}
	function LoadFromDatabase($MessageId)
	{
	global $Errors;

	$sql = sprintf("SELECT * FROM ".$this->tablename." WHERE ".$this->IdField()." = '%s'",$MessageId);
	$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);
	return TRUE;
	}

	function EditTemplate()
	{
	}

	/* read the template, split into peices */
	function ReadTemplate()
	{
	if(!$this->TemplateParsed)
	{
	$this->headers = array();
	$lines = explode("\n",$this->Get("Template"));
	$header_end = FALSE;
	$i = 0;
	while(!$header_end && $i<count($lines))
	{
	$h = $lines[$i];
	if(strlen(trim($h))==0 \|\| ($h=="."))
	{
	$header_end = TRUE;
	}
	else
	{
	$parts = explode(":",$h,2);

	if(strtolower($parts[0])=="subject")
	{
	$this->subject = $h;
	}
	else
	$this->headers[] = $h;
	}
	$i++;
	}
	while($i<count($lines))
	{
	$this->body .= $lines[$i++];
	}
	$this->TemplateParsed=TRUE;
	}
	}

	function ParseSection($text, $parser=null)
	{
	global $objUsers, $objTemplate;

	$res = $this->ParseTemplateText($text);

	/* parse email class tags */
	if(!is_object($this->fromuser))
	{
	$this->fromuser = $objUsers->GetItem($this->Get("FromUserId"));
	$this->fromuser->TagPrefix = "fromuser";
	}

	/* parse from user object */
	if(is_object($this->fromuser))
	{
	$res = $this->fromuser->ParseTemplateText($res);
	}

	/* parse recipient user object */
	if(is_object($this->recipient))
	{
	$res = $this->recipient->ParseTemplateText($res);
	}

	//print_pre($this->Item);
	if(is_object($this->Item))
	{
	$res = $this->Item->ParseTemplateText($res);
	}
	else
	{

	if(!is_object($objTemplate))
	$objTemplate = new clsTemplateList(" ");
	$res = $objTemplate->ParseTemplateText($res);
	}

	return $res;
	}

	function SendToGroup($GroupId)
	{
	global $objUsers;

	$users = $objUsers->Query_GroupPortalUser("GroupId=$GroupId");
	if(is_array($users))
	{
	foreach($users as $u)
	{
	$this->SendToUser($u->Get("PortalUserId"));
	}
	}
	}

	function SendToAddress($EmailAddress,$name="")
	{
	global $objUsers, $objEmailQueue,$objConfig;

	$conn = &GetADODBConnection();
	//$this->recipient = $objUsers->GetUser($UserId);
	//$this->recipient->TagPrefix="touser";
	if(strlen($EmailAddress))
	{
	$to_addr = $EmailAddress;
	$this->ReadTemplate();

	$subject = $this->ParseSection($this->subject);
	$body = $this->ParseSection($this->body);

	if(is_object($this->fromuser))
	{
	$FromAddr = $this->fromuser->Get("Email");
	$FromName = trim($this->fromuser->Get("FirstName")." ".$this->fromuser->Get("LastName"));
	}
	if(!strlen($FromAddr))
	{
	$FromName = strip_tags( $objConfig->Get('Site_Name') );
	$FromAddr = $objConfig->Get("Smtp_AdminMailFrom");
	}

	$charset = "ascii-us";
	if($this->Get("MessageType")=="html")
	{
	$objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset, $this->Get("Event"),NULL,$this->headers);
	}
	else
	{
	$body = nl2br($body);
	$body = str_replace("<br />","\n",$body);
	$objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
	}

	/*$time = adodb_mktime();

	$sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To', '$subject', $time, '')";
	$conn->Execute($sql); */

	return TRUE;
	}
	return FALSE;
	}


	function SendToUser($UserId)
	{
	global $objUsers, $objEmailQueue, $objConfig;

	$conn = &GetADODBConnection();
	//echo "Handling Event ".$this->Get("Event")." for user $UserId <br>\n";
	$this->recipient = new clsPortalUser($UserId); // $objUsers->GetItem($UserId);
	//echo "<PRE>";print_r($this->recipient); echo "</PRE>";
	$this->recipient->TagPrefix="touser";
	if($this->recipient->Get("PortalUserId")==$UserId)
	{
	$to_addr = $this->recipient->Get("Email");
	$To = trim($this->recipient->Get("FirstName")." ".$this->recipient->Get("LastName"));

	$this->ReadTemplate();

	$subject = $this->ParseSection($this->subject, $this->recipient);
	$body = $this->ParseSection($this->body);

	if(!is_object($this->fromuser))
	{
	$this->fromuser = $objUsers->GetItem($this->Get("FromUserId"));
	}
	if(is_object($this->fromuser))
	{
	$FromAddr = $this->fromuser->Get("Email");
	$FromName = trim($this->fromuser->Get("FirstName")." ".$this->fromuser->Get("LastName"));

	$charset = "ascii-us";
	}

	if(!strlen($FromAddr))
	{
	$FromName = strip_tags( $objConfig->Get('Site_Name') );
	$FromAddr = $objConfig->Get("Smtp_AdminMailFrom");
	}
	// echo $this->Event;

	if($this->Get("MessageType")=="html")
	{
	$objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset, $this->Get("Event"),NULL,$this->headers);
	}
	else
	{
	$body = nl2br($body);
	$body = str_replace("<br />","\n",$body);
	$objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
	}

	/*$time = adodb_mktime();

	$sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')";
	$conn->Execute($sql); */

	return TRUE;
	}
	return FALSE;
	}

	function SendAdmin()
	{
	global $objUsers, $objConfig, $objEmailQueue;

	$conn = &GetADODBConnection();

	$this->recipient = $objUsers->GetUser($this->Get("FromUserId"));
	$this->recipient->TagPrefix="touser";

	if($this->recipient->Get("PortalUserId")==$this->Get("FromUserId") \|\| strlen($this->recipient->Get("PortalUserId")) == 0)
	{
	$to_addr = $this->recipient->Get("Email");
	$To = trim($this->recipient->Get("FirstName")." ".$this->recipient->Get("LastName"));
	$this->ReadTemplate();

	if (strlen($to_addr) == 0) {
	$to_addr = $objConfig->Get("Smtp_AdminMailFrom");
	}

	$subject = $this->ParseSection($this->subject);
	$body = $this->ParseSection($this->body);
	$FromName = strip_tags( $objConfig->Get('Site_Name') );
	$FromAddr = $objConfig->Get("Smtp_AdminMailFrom");
	if(strlen($FromAddr))
	{
	$charset = "ascii-us";
	if($this->Get("MessageType")=="html")
	{
	$objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,$this->Get("Event"),NULL,$this->headers);
	}
	else
	{
	$body=nl2br($body);
	$body = str_replace("<br />","\n",$body);
	$objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
	}

	/* $time = adodb_mktime();

	$sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')";
	$conn->Execute($sql);
	*/
	return TRUE;
	}
	}
	return FALSE;
	}

	function ParseTemplateText($text)
	{
	$html = $text;
	$search = "<inp:";
	//$search = "<inp:".$this->TagPrefix;
	//$next_tag = strpos($html,"<inp:");
	$next_tag = strpos($html,$search);

	while($next_tag)
	{
	$closer = strpos(strtolower($html),">",$next_tag);
	$end_tag = strpos($html,"/>",$next_tag);
	if($end_tag < $closer \|\| $closer == 0)
	{
	$tagtext = substr($html,$next_tag,($end_tag - $next_tag)+2);
	$pre = substr($html,0,$next_tag);
	$post = substr($html,$end_tag+2);
	$inner = $this->ParseElement($tagtext);
	$html = $pre.$inner.$post;
	}
	else
	{

	$OldTagStyle = "</inp>";

	## Try to find end of TagName
	$TagNameEnd = strpos($html, " ", $next_tag);

	## Support Old version
	// $closer = strpos(strtolower($html),"</inp>",$next_tag);
	if ($TagNameEnd)
	{
	$Tag = strtolower(substr($html, $next_tag, $TagNameEnd-$next_tag));
	$TagName = explode(":", $Tag);
	if (strlen($TagName[1]))
	$CloserTag = "</inp:".$TagName[1].">";
	}
	else
	{
	$CloserTag = $OldTagStyle;
	}

	$closer = strpos(strtolower($html), $CloserTag, $next_tag);

	## Try to find old tag closer
	if (!$closer && ($CloserTag != $OldTagStyle))
	{
	$CloserTag = $OldTagStyle;
	$closer = strpos(strtolower($html), $CloserTag, $next_tag);
	}

	$end_tag = strpos($html,">",$next_tag);
	$tagtext = substr($html,$next_tag,($end_tag - $next_tag)+1);
	$pre = substr($html,0,$next_tag);
	$inner = substr($html,$end_tag+1,$closer-($end_tag+1));
	$post = substr($html,$end_tag+1+strlen($inner) + strlen($CloserTag));
	//echo "PRE:". htmlentities($pre,ENT_NOQUOTES);
	//echo "INNER:". htmlentities($inner,ENT_NOQUOTES);
	//echo "POST:". htmlentities($post,ENT_NOQUOTES);

	$parsed = $this->ParseElement($tagtext);
	if(strlen($parsed))
	{
	$html = $pre.$this->ParseTemplateText($inner).$post;
	}
	else
	$html = $pre.$post;
	}
	$next_tag = strpos($html,$search);
	}
	return $html;
	}

	function ParseElement($raw, $inner_html ="")
	{
	$tag = new clsHtmlTag($raw);
	$tag->inner_html = $inner_html;

	if($tag->parsed)
	{
	if($tag->name=="include" \|\| $tag->name=="perm_include" \|\| $tag->name=="lang_include")
	{
	$output = $this->Parser->IncludeTemplate($tag);
	}
	else
	{
	if (is_object($this->Item)) {
	$this->Item->TagPrefix = $tag->name;
	$output = $this->Item->ParseObject($tag);
	}
	else {
	$output = $this->ParseObject($tag);
	}

	if(substr($output,0,9)=="Undefined")
	{
	$output = $tag->Execute();
	// if(substr($output,0,8)="{Unknown")
	// $output = $raw;
	} return $output;
	}
	}
	else
	return "";
	}
	}

	class clsEmailMessageList extends clsItemCollection
	{
	function clsEmailMessageList()
	{
	$this->clsItemCollection();
	$this->classname = "clsEmailMessage";
	$this->SourceTable = GetTablePrefix()."EmailMessage";
	$this->PerPageVar = "Perpage_EmailEvents";
	$this->AdminSearchFields = array("Template","Description", "Module","Event");
	}

	function LoadLanguage($LangId=NULL)
	{
	global $objLanguages;

	if(!$LangId)
	$LangId = $objLanguages->GetPrimary();

	$sql = "SELECT * FROM ".$this->SourceTable." WHERE LanguageId=$LangId";
	$this->Clear();
	return $this->Query_Item($sql);
	}

	function &AddEmailEvent($Template, $Type, $LangId, $EventId)
	{
	$e = new clsEmailMessage();
	$e->tablename = $this->SourceTable;
	$e->Set(array("Template","MessageType","LanguageId","EventId"),
	array($Template,$Type,$LangId,$EventId));
	$e->Dirty();
	$e->Create();

	return $e;
	}

	function DeleteLanguage($LangId)
	{
	$sql = "DELETE FROM ".$this->SourceTable." WHERE LanguageId=$LangId OR LanguageId = 0";
	if( $GLOBALS['debuglevel'] ) echo $sql."<br>\n";

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

	function &GetMessage($EventId,$LangId,$LoadFromDB=TRUE)
	{
	$found=FALSE;

	if(is_array($this->Items))
	{
	for($x=0;$x<count($this->Items);$x++)
	{
	$i =& $this->GetItemRefByIndex($x);
	if(is_object($i))
	{
	if($i->Get("EventId")==$EventId && $i->Get("LanguageId")==$LangId)
	{
	$found=TRUE;
	break;
	}
	}
	}
	}
	if(!$found)
	{
	if($LoadFromDB)
	{
	$n = NULL;
	$n = new $this->classname();
	$n->tablename = $this->SourceTable;
	if($n->LoadEvent($EventId,$LangId))
	{
	array_push($this->Items, $n);
	$i =& $this->Items[count($this->Items)-1];
	}
	else
	$i = FALSE;
	}
	else
	$i = FALSE;
	}
	return $i;
	}

	function CreateEmptyEditTable($IdList, $use_parent = false)
	{
	global $objSession;

	if (!$use_parent) {
	$edit_table = $objSession->GetEditTable($this->SourceTable);
	@$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table");
	$query = "SELECT * FROM ".$this->SourceTable." WHERE 0";
	$insert = "CREATE TABLE ".$edit_table." ".$query;
	if($objSession->HasSystemPermission("DEBUG.LIST"))
	echo htmlentities($insert,ENT_NOQUOTES)."<br>\n";
	$this->adodbConnection->Execute($insert);
	$this->LoadLanguage();
	$idvalue = -1;
	for($i=0;$i<$this->NumItems();$i++)
	{
	$e =& $this->Items[$i];
	$e->SourceTable = $edit_table;
	if(is_array($IdList))
	{
	foreach($IdList as $id)
	{
	$e->UnsetIdField();
	$e->Set("EmailMessageId",$idvalue--);
	$e->Set("LanguageId",$id);
	// $e->Set("Description",admin_language("la_desc_emailevent_".$e->Get("Event"),$id));
	$e->Create();
	}
	}
	else
	{
	$e->UnsetIdField();
	$e->Set("EmailMessageId",$idvalue--);
	$e->Set("LanguageId",$IdList);
	// $e->Set("Description",admin_language("la_desc_emailevent_".$e->Get("Event"),$LangId));
	$e->Create();
	}
	}
	$this->Clear();
	}
	else {
	parent::CreateEmptyEditTable($IdList);
	}
	}

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

	$idfield = "EmailMessageId";
	$edit_table = $objSession->GetEditTable($this->SourceTable);
	$sql = "SELECT * FROM $edit_table WHERE LanguageId <> 0";
	$rs = $this->adodbConnection->Execute($sql);
	while($rs && !$rs->EOF)
	{
	$data = $rs->fields;
	$c = new $this->classname;
	$c->SetFromArray($data);
	//$c->idfield = $idfield;
	if($c->Get($idfield)<1)
	{
	$old_id = $c->Get($idfield);
	$c->Dirty();
	$c->UnsetIdField();
	$c->Create();
	}
	else
	{
	$c->Dirty();
	$c->Update();
	}
	$rs->MoveNext();
	}
	@$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table");
	unset($GLOBALS['_CopyFromEditTable']);
	}

	function PurgeEditTable()
	{
	global $objSession;

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

	function &GetEmailEventObject($EventName,$Type=0,$LangId=NULL)
	{
	global $objLanguages;

	if(!$LangId)
	$LangId = $objLanguages->GetPrimary();
	$EmailTable = $this->SourceTable;
	$EventTable = GetTablePrefix()."Events";
	$sql = "SELECT * FROM $EventTable INNER JOIN $EmailTable ON ($EventTable.EventId = $EmailTable.EventId) ";
	$sql .="WHERE Event='$EventName' AND LanguageId=$LangId AND Type=$Type";
	$result = $this->adodbConnection->Execute($sql);

	if ($result === FALSE)
	{
	//$Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"","clsEvent","GetEmailEventObject");
	return FALSE;
	}
	$data = $result->fields;
	$e = new clsEmailMessage();
	$e->SetFromArray($data);
	$e->Clean();
	return $e;
	}

	function ReadImportTable($TableName,$Overwrite=FALSE, $MaxInserts=100,$Offset=0)
	{
	$eml = new clsEmailMessageList();
	$this->Clear();
	$Inserts = 0;
	$sql = "SELECT * FROM $TableName LIMIT $Offset,$MaxInserts";
	$this->Query_Item($sql);
	if($this->NumItems()>0)
	{
	foreach($this->Items as $i)
	{
	$e = $eml->GetMessage($i->Get("EventId"),$i->Get("LanguageId"));
	if(is_object($e))
	{
	if($Overwrite)
	{
	$e->Set("MessageType",$i->Get("MessageType"));
	$e->Set("Template",$i->Get("Template"));
	$e->Update();
	}
	}
	else
	{
	$i->Create();
	}
	$Inserts++;
	}
	}
	$Offset = $Offset + $Inserts;
	return $Offset;
	}
	}

	function EventEnabled($e)
	{
	global $objConfig;

	$var = "Email_".$e."_Enabled";

	return ($objConfig->Get($var)=="1");
	}

	class clsEmailQueue
	{
	var $SourceTable;
	var $MessagesAtOnce;
	var $MessagesSent=0;
	var $LogLevel = 0;
	var $HLB = "\n"; // Headers Line Break
	var $BLB = "\n"; // Body Line Break

	function clsEmailQueue($SourceTable=NULL,$MessagesAtOnce=NULL)
	{
	global $objConfig;

	$this->HLB = chr(10);
	$this->BLB = chr(10);

	if($SourceTable)
	{
	$this->SourceTable=$SourceTable;
	}
	else
	$this->SourceTable = GetTablePrefix()."EmailQueue";
	if(!$MessagesAtOnce)
	$MessagesAtOnce = (int)$objConfig->Get("Email_MaxSend");
	if($MessagesAtOnce<1)
	$MessagesAtOnce=1;
	$this->MessagesAtOnce = $MessagesAtOnce;
	$this->LogLevel = (int)$objConfig->Get("Smtp_LogLevel");
	}

	function WriteToMailLog($text)
	{
	global $pathtoroot,$admin;
	//echo htmlentities($text)."<br>\n";
	if($this->LogLevel>0)
	{
	$Logfile = $pathtoroot.$admin."/email/log.txt";
	if(is_writable($Logfile))
	{
	$fp = fopen($Logfile,"a");
	if($fp)
	{
	fputs($fp,$text."\n");
	fclose($fp);
	}
	}
	}
	}

	function AllowSockets()
	{
	$minver = explode(".", "4.3.0");
	$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 DeliverMail($To,$From,$Subject,$Msg,$headers, $ForceSend=0)
	{
	global $MessagesSent,$objConfig;

	if(($this->MessagesSent >$this->MessagesAtOnce) && !$ForceSend)
	{
	$this->EnqueueMail($To,$From,$Subject,$Msg,$headers);
	return TRUE;
	}
	else
	{
	$this->MessagesSent++;

	$time = adodb_mktime();
	$conn = &GetADODBConnection();

	/* $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '".htmlspecialchars($From)."', '".htmlspecialchars($To)."', '$Subject', $time, '')";
	$conn->Execute($sql);*/


	$headers = "Date: ".adodb_date("r")."\n".$headers;
	$headers = "Return-Path: ".$objConfig->Get("Smtp_AdminMailFrom")."\n".$headers;

	/* ensure headers are using \r\n instead of \n */
	$headers = str_replace("\n\n","\r\n\r\n",$headers);
	$headers = str_replace("\r\n","\n",$headers);
	$headers = str_replace("\n","\r\n",$headers);

	// if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
	$Msg = str_replace("\n\n","\r\n\r\n",$Msg);
	$Msg = str_replace("\r\n","\n",$Msg);
	$Msg = str_replace("\n","\r\n",$Msg);
	// }

	//echo "<PRE>"; print_r(htmlentities($headers)); echo "</PRE>";
	//echo "<PRE>"; print_r(htmlentities($Msg)); echo "</PRE>";
	$ver = phpversion();
	if(substr($Subject,0,9)=="Subject: ")
	$Subject = substr($Subject,9);
	if(!strlen($objConfig->Get("Smtp_Server")) \|\| !$this->AllowSockets())
	{
	return mail($To,trim($Subject),$Msg, $headers);
	}

	$headers = "To: <".$To.">"."\n".$headers;
	$headers = "Subject: ".trim($Subject)."\r\n".$headers;

	if (strpos($To, ',') !== false) {
	$To = str_replace(' ', '', $this->To);
	$send_params['recipients'] = explode(',', $this->To);
	}
	else {
	$send_params['recipients'] = array($To); // The recipients (can be multiple)
	}
	$send_params['from'] = $From; // This is used as in the MAIL FROM: cmd
	$send_params['headers'] = explode("\r\n",$headers);
	// It should end up as the Return-Path: header
	$send_params['body'] = $Msg; // The body of the email

	$params['host'] = $objConfig->Get("Smtp_Server"); // The smtp server host/ip

	$params['port'] = 25; // The smtp server port
	$params['hello'] = 'INPORTAL'; // What to use when sending the helo command. Typically, your domain/hostname
	if($objConfig->Get("Smtp_Authenticate")) // Whether to use basic authentication or not
	{
	$params['auth'] = TRUE;
	$params['user'] = $objConfig->Get("Smtp_User");
	$params['pass'] = $objConfig->get("Smtp_Pass");
	}
	else
	$params['auth'] = FALSE;
	$this->LogLevel=0;
	$SmtpServer = new smtp($params);
	if($this->LogLevel>0)
	{
	$SmtpServer->debug=1;
	foreach($params as $key=>$value)
	{
	$this->WriteToMailLog($key."=".$value);
	}
	}
	else
	{
	//$SmtpServer->debug = 1;
	}
	$connected = $SmtpServer->connect();

	if($connected)
	{
	if($this->LogLevel>1)
	{
	$this->WriteToMailLog("Connected to ".$params['host']);
	}
	$res = $SmtpServer->send($send_params);
	}
	$SmtpServer->disconnect();

	if($this->LogLevel>1)
	{
	foreach($SmtpServer->buffer as $l)
	{
	$this->WriteToMailLog($l);
	}
	}

	if($this->LogLevel>0)
	{
	if(count($SmtpServer->errors)>0)
	{
	foreach($SmtpServer->errors as $e)
	{
	$this->WriteToMailLog($e);
	}
	}
	else
	$this->WriteToMailLog("Message to $From Delivered Successfully");
	}
	unset($SmtpServer);
	return $res;
	}
	}

	function EnqueueMail($To,$From,$Subject,$Msg,$headers)
	{
	global $objSession;

	$ado = &GetADODBConnection();
	$To = mysql_escape_string($To);
	$From = mysql_escape_string($From);
	$Msg = mysql_escape_string($Msg);
	$headers = mysql_escape_string($headers);
	$Subject = mysql_escape_string($Subject);
	$sql = "INSERT INTO ".$this->SourceTable." (toaddr,fromaddr,subject,message,headers) VALUES ('$To','$From','$Subject','$Msg','$headers')";
	$ado->Execute($sql);
	}

	function SendMailQeue()
	{
	global $objConfig, $objSession, $TotalMessagesSent;

	$ado = &GetADODBConnection();
	$MaxAllowed = $this->MessagesAtOnce;

	$del_sql = array();

	$NumToSend = $MaxAllowed - $this->MessagesSent;
	if($NumToSend < 0) $NumToSend=1; // Don't really know why, but this could happend, so issued this temp fix
	$sql = "SELECT * FROM ".$this->SourceTable." ORDER BY queued ASC LIMIT $NumToSend";
	$rs = $ado->Execute($sql);

	while($rs && !$rs->EOF)
	{
	$data = $rs->fields;
	- $this->DeliverMail($data["toaddr"],$data["fromaddr"],$data["Subject"],$data["headers"],$data["message"],1);
	+ $this->DeliverMail($data["toaddr"],$data["fromaddr"],$data["Subject"],$data["message"],$data["headers"],1);

	$del_sql[] = "DELETE FROM ".$this->SourceTable." WHERE queued='".$data["queued"]."'";
	$rs->MoveNext();
	}

	$numdel = count($del_sql);
	for($i=0;$i<$numdel;$i++)
	{
	$sql = $del_sql[$i];
	if(strlen($sql))
	$ado->Execute($sql);
	if($objSession->HasSystemPermission("DEBUG.ITEM"))
	echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
	}
	}

	function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, $SendEvent,
	$FileName="",$FileLoc="",$QueueOnly=0,$extra_headers = array())
	{
	$HasFile = FALSE;
	$HasFile = (strlen($FileName)>0);
	$OB="----=_OuterBoundary_000".md5( uniqid (rand()));
	$boundary = "-----=".md5( uniqid (rand()));
	$f = "\"$FromName\" <".$From.">";
	$headers = "From: $f"."\n";
	$headers .= "MIME-Version: 1.0"."\n";

	$conn = &GetADODBConnection();
	$time = adodb_mktime();

	$sendTo = $ToName;

	if (strlen($sendTo) > 0) {
	$sendTo .= "($ToAddr)";
	}
	else {
	$sendTo = $ToAddr;
	}
	$sendTo=addslashes($sendTo);
	$sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', ".$conn->qstr($FromName).", ".$conn->qstr($sendTo).", ".$conn->qstr( str_replace("Subject:", "", $Subject) ).", $time, '$SendEvent')";
	$conn->Execute($sql);

	$msg .="This is a multi-part message in MIME format."."\n"."\n";
	if($HasFile)
	{
	//Messages start with text/html alternatives in OB
	$headers.="Content-Type: multipart/mixed;"."\n"."\tboundary=\"".$OB."\""."\n"."\n";
	$msg.="--".$OB."\n";
	$msg.="Content-Type: multipart/alternative; boundary=\"$boundary\""."\n"."\n"."\n";
	}
	else {
	$headers .= "Content-Type: multipart/alternative; boundary=\"$boundary\""."\n";
	}
	if(is_array($extra_headers))
	{
	for($i=0;$i<count($extra_headers);$i++);
	{
	$headers .= $extra_headers[$i]."\n";
	}
	}

	if(!$Text)
	{
	$Text=strip_tags($Html);
	}

	$msg .= "--" . $boundary . "\n";
	$msg .= "Content-Type: text/plain; charset=\"$charset\""."\n";
	$msg .= "Content-Transfer-Encoding: 8bit"."\n"."\n";
	$msg .= stripslashes($Text);
	$msg .= "\n"."\n";

	if(strlen($Html)>0)
	{
	$msg .= "--" . $boundary . "\n";
	$msg .= "Content-Type: text/html; charset=\"iso-8859-1\""."\n";
	$msg .= "Content-Transfer-Encoding: 8bit"."\n"."\n";
	$msg .= stripslashes($Html);
	$msg .= "\n"."\n";
	}
	$msg .= "--" . $boundary . "--"."\n";
	if($HasFile)
	{
	if(!strlen($FileLoc)) {
	$FileLoc = $FileName;
	}
	$FileName = basename($FileName);
	$msg .= "\n"."--".$OB."\n";
	$msg.="Content-Type: application/octetstream;"."\n"."\tname=\"".$FileName."\""."\n";
	$msg.="Content-Transfer-Encoding: base64"."\n";
	$msg.="Content-Disposition: attachment;"."\n"."\tfilename=\"".$FileName."\""."\n"."\n";

	//file goes here
	$fd=fopen ($FileLoc, "r");
	if($fd)
	{
	$FileContent=fread($fd,filesize($FileLoc));
	fclose ($fd);
	}
	$FileContent=chunk_split(base64_encode($FileContent));
	$msg .= $FileContent."\n";
	$msg .= "--".$OB."--"."\n";
	}

	if($this->MessagesSent>$this->MessagesAtOnce \|\| $QueueOnly==1)
	{
	$this->EnqueueMail($ToAddr,$From,$Subject,$msg,$headers);
	}
	else
	{
	$this->DeliverMail($ToAddr,$From,$Subject,$msg,$headers);
	}
	}

	}
	?>

	Property changes on: trunk/kernel/include/emailmessage.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.53
	\ No newline at end of property
	+1.54
	\ No newline at end of property
	Index: trunk/kernel/admin_templates/incs/style.css
	===================================================================
	--- trunk/kernel/admin_templates/incs/style.css (revision 3619)
	+++ trunk/kernel/admin_templates/incs/style.css (revision 3620)
	@@ -1,502 +1,505 @@
	/* --- In-Portal --- */


	.head_version {
	font-family: verdana, arial;
	font-size: 10px;
	font-weight: normal;
	color: white;
	padding-right: 5px;
	text-decoration: none;
	}

	body {
	- font-family: Verdana, Arial, Helvetica, Sans-serif;
	- font-size: 12px;
	- color: #000000;
	- scrollbar-3dlight-color: #333333;
	- scrollbar-arrow-color: #ffffff;
	- scrollbar-track-color: #88d2f8;
	+ font-family: Verdana, Arial, Helvetica, Sans-serif;
	+ font-size: 12px;
	+ color: #000000;
	+ scrollbar-3dlight-color: #333333;
	+ scrollbar-arrow-color: #ffffff;
	+ scrollbar-track-color: #88d2f8;
	scrollbar-darkshadow-color: #333333;
	- scrollbar-highlight-color: #009ffd;
	- scrollbar-shadow-color: #009ffd;
	+ scrollbar-highlight-color: #009ffd;
	+ scrollbar-shadow-color: #009ffd;
	scrollbar-face-color: #009ffd;
	overflow-x: auto; overflow-y: auto;
	}

	A {
	color: #006699;
	text-decoration: none;
	}

	A:hover {
	color: #009ff0;
	text-decoration: none;
	}

	TD {
	font-family: verdana,helvetica;
	font-size: 10pt;
	text-decoration: none;
	}

	form {
	display: inline;
	}

	.text {
	font-family: verdana, arial;
	font-size: 12px;
	font-weight: normal;
	text-decoration: none;
	}

	.tablenav {
	- font-family: verdana, arial;
	+ font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	color: #FFFFFF;
	-
	+
	text-decoration: none;
	background-color: #73C4F5;
	background: url(../img/tabnav_back.gif) repeat-x;
	}

	.tablenav_link {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	color: #FFFFFF;
	text-decoration: none;
	}

	.header_left_bg {
	background: url(../img/tabnav_left.gif) no-repeat;
	}

	.tablenav_link:hover {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	color: #ffcc00;
	text-decoration: none;
	}

	.tableborder {
	font-family: arial, helvetica, sans-serif;
	- font-size: 10pt;
	+ font-size: 10pt;
	border: 1px solid #000000;
	border-top-width: 0px;
	+ border-collapse: collapse;
	}

	.tableborder_full, .tableborder_full_kernel {
	font-family: Arial, Helvetica, sans-serif;
	font-size: 10pt;
	border: 1px solid #000000;
	}


	.button {
	font-family: arial, verdana;
	font-size: 12px;
	font-weight: normal;
	color: #000000;
	background: url(../img/button_back.gif) #f9eeae repeat-x;
	text-decoration: none;
	}

	.button-disabled {
	font-family: arial, verdana;
	font-size: 12px;
	font-weight: normal;
	color: #676767;
	background: url(../img/button_back_disabled.gif) #f9eeae repeat-x;
	text-decoration: none;
	}

	.hint_red {
	font-family: Arial, Helvetica, sans-serif;
	font-size: 10px;
	font-style: normal;
	color: #FF0000;
	/* background-color: #F0F1EB; */
	}

	.tree_head {
	font-family: verdana, arial;
	font-size: 10px;
	font-weight: bold;
	color: #FFFFFF;
	text-decoration: none;
	}

	.admintitle {
	font-family: verdana, arial;
	font-size: 20px;
	font-weight: bold;
	color: #009FF0;
	text-decoration: none;
	}

	.table_border_notop, .table_border_nobottom {
	- background-color: #F0F1EB;
	- border: 1px solid #000000;
	+ background-color: #F0F1EB;
	+ border: 1px solid #000000;
	}

	.table_border_notop {
	border-top-width: 0px;
	}

	.table_border_nobottom {
	border-bottom-width: 0px;
	}

	.pagination_bar {
	- background-color: #D7D7D7;
	+ background-color: #D7D7D7;
	border: 1px solid #000000;
	border-top-width: 0px;
	}

	/* Categories */

	.priority {
	color: #FF0000;
	padding-left: 1px;
	padding-right: 1px;
	font-size: 11px;
	}

	.cat_no, .cat_desc, .cat_new, .cat_pick, .cats_stats {
	font-family: arial, verdana, sans-serif;
	}

	.cat_no {
	font-size: 10px;
	color: #707070;
	}

	.cat_desc {
	font-size: 9pt;
	color: #000000;
	}

	.cat_new {
	font-size: 12px;
	vertical-align: super;
	color: blue;
	}

	.cat_pick {
	font-size: 12px;
	vertical-align: super;
	color: #009900;
	}

	.cats_stats {
	font-size: 11px;
	color: #707070;
	-}
	+}

	/* Links */

	.link, .link:hover, .link_desc, .link_detail {
	font-family: arial, helvetica, sans-serif;
	}

	.link {
	font-size: 9pt;
	color: #1F569A;
	}

	.link:hover {
	font-size: 9pt;
	color: #009FF0;
	}

	.link_desc {
	font-size: 9pt;
	color: #000000;
	}

	.link_detail {
	font-size: 11px;
	color: #707070;
	}

	.link_rate, .link_review, .link_modify, .link_div, .link_new, .link_top, .link_pop, .link_pick {
	font-family: arial, helvetica, sans-serif;
	font-size: 12px;
	}

	.link_rate, .link_review, .link_modify, .link_div {
	text-decoration: none;
	}

	.link_rate { color: #006600; }
	.link_review { color: #A27900; }
	.link_modify { color: #800000; }
	.link_div { color: #000000; }

	.link_new, .link_top, .link_pop, .link_pick {
	vertical-align: super;
	}

	.link_new { color: #0000FF; }
	.link_top { color: #FF0000; }
	.link_pop { color: FFA500; }
	.link_pick { color: #009900; }

	/* ToolBar */

	.divider {
	BACKGROUND-COLOR: #999999
	}

	.toolbar {
	- font-family: Arial, Helvetica, sans-serif;
	- font-size: 10pt;
	+ font-family: Arial, Helvetica, sans-serif;
	+ font-size: 10pt;
	border: 1px solid #000000;
	border-width: 0 1 1 1;
	background-color: #F0F1EB;
	}

	.current_page {
	font-family: verdana;
	font-size: 12px;
	font-weight: bold;
	background-color: #C4C4C4;
	padding-left: 1px;
	padding-right: 1px;
	}

	.nav_url {
	font-family: verdana;
	font-size: 12px;
	font-weight: bold;
	color: #1F569A;
	}

	.nav_arrow {
	font-family: verdana;
	font-size: 12px;
	font-weight: normal;
	color: #1F569A;
	padding-left: 3px;
	padding-right: 3px;
	}

	.nav_current_item {
	font-family: verdana;
	font-size: 12px;
	font-weight: bold;
	color: #666666;
	}

	/* Edit forms */

	.hint {
	font-family: arial, helvetica, sans-serif;
	font-size: 12px;
	font-style: normal;
	color: #666666;
	}

	.table_color1, .table_color2 {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: normal;
	color: #000000;
	text-decoration: none;
	-}
	+}

	.table_color1 { background-color: #F6F6F6; }
	.table_color2 { background-color: #EBEBEB; }


	.table_white, .table_white_selected {
	font-family: verdana, arial;
	font-weight: normal;
	font-size: 14px;
	color: #000000;
	text-decoration: none;
	padding-top: 0px;
	padding-bottom: 0px;
	}

	.table_white {
	background-color: #FFFFFF;
	}

	.table_white_selected {
	- background-color: #C6D6EF;
	+ background-color: #C6D6EF;
	}

	.subsectiontitle {
	font-family: verdana, arial;
	- font-size: 14px;
	- font-weight: bold;
	- color: #FFFFFF;
	- background-color: #999999;
	- text-decoration: none;
	+ font-size: 14px;
	+ font-weight: bold;
	+ color: #FFFFFF;
	+ background-color: #999999;
	+ text-decoration: none;
	height: 24px;
	}
	+
	.subsectiontitle:hover {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	color: #FFCC00;
	background-color: #999999;
	text-decoration: none;
	}

	.error {
	font-family: arial, helvetica, sans-serif;
	font-weight: bold;
	font-size: 9pt;
	color: #FF0000;
	}

	/* Tabs */

	.tab_border {
	border: 1px solid #000000;
	border-width: 1 0 0 0;
	}

	.tab, .tab:hover {
	font-family: verdana, arial, helvetica;
	font-size: 12px;
	font-weight: bold;
	color: #000000;
	text-decoration: none;
	}

	.tab2, .tab2:hover {
	font-family: verdana, arial, helvetica;
	font-size: 12px;
	font-weight: bold;
	text-decoration: none;
	}

	.tab2 { color: #FFFFFF; }
	.tab2:hover { color: #000000; }

	/* Item DIVS */

	.selected_div { background-color: #C6D6EF; }
	.notselected_div { background-color: #FFFFFF; }

	/* Item tabs */


	.itemtab_active {
	- background: url("../img/itemtabs/tab_active.gif") #eee repeat-x;
	+ background: url("../img/itemtabs/tab_active.gif") #eee repeat-x;
	}

	.itemtab_inactive {
	- background: url("../img/itemtabs/tab_inactive.gif") #F9EEAE repeat-x;
	+ background: url("../img/itemtabs/tab_inactive.gif") #F9EEAE repeat-x;
	}


	/* Grids */

	.columntitle, .columntitle:hover {
	font-family: verdana, arial;
	font-size: 14px;
	font-weight: bold;
	background-color: #999999;
	text-decoration: none;
	}

	.columntitle { color: #FFFFFF; }
	.columntitle:hover { color: #FFCC00; }

	.columntitle_small, .columntitle_small:hover {
	font-family: verdana, arial;
	font-size: 12px;
	font-weight: bold;
	background-color: #999999;
	text-decoration: none;
	}

	.columntitle_small { color: #FFFFFF; }
	.columntitle_small:hover { color: #FFCC00; }

	/* ----------------------------- */

	.section_header_bg {
	background: url(../img/logo_bg.gif) no-repeat top right;
	}

	.small {
	font-size: 9px;
	font-family: Verdana, Arial, Helvetica, sans-serif;
	}

	/* order preview & preview_print styles */

	.order_print_defaults TD,
	.order_preview_header,
	-.order_preview_header TD,
	+.order_preview_header TD,
	.order_print_preview_header TD,
	.order_preview_field_name,
	.order-totals-name,
	.arial2r,
	.orders_print_flat_table TD {
	font-family: Arial;
	font-size: 10pt;
	}

	.order_preview_header, .order_preview_header TD, .order_print_preview_header TD {
	background-color: #C9E9FE;
	font-weight: bold;
	}

	.order_print_preview_header TD {
	background-color: #FFFFFF;
	}

	.order_preview_field_name {
	font-weight: bold;
	+ padding: 2px 4px 2px 4px;
	}

	.order-totals-name {
	- font-style: italic;
	+ font-style: normal;
	}

	-.border1 {
	+.border1 {
	border: 1px solid #111111;
	}

	.arial2r {
	color: #602830;
	font-weight: bold;
	}

	.orders_flat_table, .orders_print_flat_table {
	border-collapse: collapse;
	+ margin: 5px;
	}

	.orders_flat_table TD {
	- border: 1px solid #000000;
	- padding-left: 2px;
	- padding-right: 2px;
	+ padding: 2px 5px 2px 5px;
	+ border: 1px solid #444444;
	}

	.orders_print_flat_table TD {
	border: 1px solid #000000;
	padding: 2px 5px 2px 5px;
	}

	.help_box {
	padding: 5px 10px 5px 10px;
	}

	.progress_bar
	{
	background: url(../img/progress_bar_segment.gif);
	}

	.grid_id_cell TD {
	padding-right: 2px;
	}
	\ No newline at end of file

	Property changes on: trunk/kernel/admin_templates/incs/style.css
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.7
	\ No newline at end of property
	+1.8
	\ No newline at end of property
	Index: trunk/core/kernel/utility/unit_config_reader.php
	===================================================================
	--- trunk/core/kernel/utility/unit_config_reader.php (revision 3619)
	+++ trunk/core/kernel/utility/unit_config_reader.php (revision 3620)
	@@ -1,462 +1,463 @@
	<?php

	class kUnitConfigReader extends kBase {

	/**
	* Configs readed
	*
	* @var Array
	* @access private
	*/
	var $configData=Array();
	var $configFiles=Array();

	var $CacheExpired = false;

	/**
	* Scan kernel and user classes
	* for available configs
	*
	* @access protected
	*/
	function Init($prefix,$special)
	{
	parent::Init($prefix,$special);
	$this->scanModules(MODULES_PATH);
	}

	/**
	* Checks if config file is allowed for includion (if module of config is installed)
	*
	* @param string $config_path relative path from in-portal directory
	*/
	function configAllowed($config_path)
	{
	$module_found = false;
	if (!$this->Application->ModuleInfo) return false;
	-
	+
	foreach($this->Application->ModuleInfo as $module_name => $module_info)
	{
	$module_path = '/'.$module_info['Path'];
	if( substr($config_path, 0, strlen($module_path)) == $module_path )
	{
	$module_found = true;
	break;
	}
	}
	return $module_found;
	}

	/**
	* Returns true if config exists and is allowed for reading
	*
	* @param string $prefix
	* @return bool
	*/
	function prefixRegistred($prefix)
	{
	return isset($this->configData[$prefix]) ? true : false;
	}

	/**
	* Read configs from all directories
	* on path specified
	*
	* @param string $folderPath
	* @access public
	*/
	function processFolder($folderPath, $cached)
	{
	$fh=opendir($folderPath);
	while(($sub_folder=readdir($fh)))
	{
	$full_path=$folderPath.'/'.$sub_folder;
	if( $this->isDir($full_path) && file_exists($this->getConfigName($full_path)) )
	{
	if (filemtime($full_path) > $cached) {
	$this->CacheExpired = true;

	$file = $this->getConfigName($full_path);
	if ( $this->Application->isDebugMode() && constOn('DBG_PROFILE_INCLUDES') )
	{

	if ( in_array($file, get_required_files()) ) return;
	global $debugger;
	$debugger->IncludeLevel++;
	$before_time = getmicrotime();
	$before_mem = memory_get_usage();
	include_once(FULL_PATH.$file);
	$used_time = getmicrotime() - $before_time;
	$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'][] = -1;
	}
	else {
	include_once($file);
	}
	-
	+
	if ( !isset($config) \|\| !$config ) continue;
	$prefix = $config['Prefix'];
	$config['BasePath'] = $full_path;
	$this->configData[$prefix] = $config;
	}
	}
	}
	}

	function ParseConfigClones($prefix)
	{
	$config = $this->configData[$prefix];
	if(!getArrayValue($config, 'Clones'))
	{
	return;
	}
	unset($this->configData[$prefix]['Clones']);
	foreach($config['Clones'] as $clone_prefix => $clone_config)
	{
	$clone_config['Prefix'] = $clone_prefix;
	$this->configData[$clone_prefix] = array_merge_recursive2($this->configData[$prefix], $clone_config);
	-
	+
	foreach($clone_config as $cloned_property => $cloned_value)
	{
	if(!$cloned_value) unset($this->configData[$clone_prefix][$cloned_property]);
	}
	-
	+
	$this->ParseConfigClones($clone_prefix);
	}
	}
	-
	+
	function ParseConfigs()
	{
	foreach ($this->configData as $prefix => $config)
	{
	$this->parseConfig($prefix);
	}
	}

	function findConfigFiles($folderPath)
	{
	$folderPath = str_replace(FULL_PATH, '', $folderPath); // this make sense, since $folderPath may NOT contain FULL_PATH
	$fh=opendir(FULL_PATH.$folderPath);
	while(($sub_folder=readdir($fh)))
	{
	$full_path = FULL_PATH.$folderPath.'/'.$sub_folder;
	if( $this->isDir($full_path))
	{
	if ( file_exists(FULL_PATH.$this->getConfigName($folderPath.'/'.$sub_folder)) ) {
	$this->configFiles[] = $this->getConfigName($folderPath.'/'.$sub_folder);
	}
	$this->findConfigFiles($full_path);

	// if (filemtime($full_path) > $cached) { }

	}
	}
	}

	function includeConfigFiles()
	{
	$db =& $this->Application->GetADODBConnection();

	foreach ($this->configFiles as $filename)
	{
	$config_found = file_exists(FULL_PATH.$filename) && $this->configAllowed($filename);
	if( $this->Application->isDebugMode() && constOn('DBG_PROFILE_INCLUDES') )
	{
	if ( in_array($filename, get_required_files()) ) return;
	global $debugger;
	$debugger->IncludeLevel++;
	$before_time = getmicrotime();
	$before_mem = memory_get_usage();
	if($config_found) include_once(FULL_PATH.$filename);
	$used_time = getmicrotime() - $before_time;
	$used_mem = memory_get_usage() - $before_mem;
	$debugger->IncludeLevel--;
	$debugger->IncludesData['file'][] = str_replace(FULL_PATH, '', $filename);
	$debugger->IncludesData['mem'][] = $used_mem;
	$debugger->IncludesData['time'][] = $used_time;
	$debugger->IncludesData['level'][] = -1;
	}
	else
	{
	if($config_found) include_once(FULL_PATH.$filename);
	}

	if($config_found && isset($config) && $config)
	{
	$prefix = $config['Prefix'];
	-
	+
	preg_match('/\/(.*)\//U', $filename, $rets);
	$config['ModuleFolder'] = $rets[1];
	$config['BasePath'] = dirname(FULL_PATH.$filename);
	$this->configData[$prefix] = $config;
	$this->ParseConfigClones($prefix);
	}
	}
	}

	function scanModules($folderPath)
	{
	global $debugger;

	if (defined('CACHE_CONFIGS_FILES')) {
	$conn =& $this->Application->GetADODBConnection();
	$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"');
	- if ($data && $data['Cached'] > (adodb_mktime() - 3600) ) {
	+// if ($data && $data['Cached'] > (adodb_mktime() - 3600) ) {
	+ if ($data && $data['Cached'] > 0 ) {
	$this->configFiles = unserialize($data['Data']);
	$files_cached = $data['Cached'];
	}
	else {
	$files_cached = 0;
	}
	}
	else {
	$files_cached = 0;
	}

	if (defined('CACHE_CONFIGS_DATA') && CACHE_CONFIGS_DATA) {
	$conn =& $this->Application->GetADODBConnection();
	$data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_data"');
	if ($data && $data['Cached'] > (adodb_mktime() - 3600) ) {
	$this->configData = unserialize($data['Data']);
	$data_cached = $data['Cached'];
	}
	else {
	$data_cached = 0;
	}
	}
	else {
	$data_cached = 0;
	}

	if ( !defined('CACHE_CONFIGS_FILES') \|\| $files_cached == 0 ) {
	$this->findConfigFiles($folderPath);
	}

	if ( !defined('CACHE_CONFIGS_DATA') \|\| $data_cached == 0) {
	$this->includeConfigFiles();
	}

	/*// && (adodb_mktime() - $cached) > 600) - to skip checking files modified dates
	if ( !defined('CACHE_CONFIGS') ) {
	$fh=opendir($folderPath);
	while(($sub_folder=readdir($fh)))
	{
	$full_path=$folderPath.'/'.$sub_folder.'/units';
	if( $this->isDir($full_path) )
	{
	$this->processFolder($full_path, $cached);
	}
	}
	}*/

	if (defined('CACHE_CONFIGS_DATA') && $data_cached == 0) {
	$conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("config_data", '.$conn->qstr(serialize($this->configData)).', '.adodb_mktime().')');
	}

	$this->ParseConfigs();

	if (defined('CACHE_CONFIGS_FILES') && $files_cached == 0) {
	$conn->Query('REPLACE '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ("config_files", '.$conn->qstr(serialize($this->configFiles)).', '.adodb_mktime().')');
	}

	unset($this->configFiles);
	// unset($this->configData);

	}

	/**
	* Register nessasary classes
	*
	* @param string $prefix
	* @access private
	*/
	function parseConfig($prefix)
	{
	$config =& $this->configData[$prefix];
	$event_manager =& $this->Application->recallObject('EventManager');
	$class_params=Array('ItemClass','ListClass','EventHandlerClass','TagProcessorClass');
	foreach($class_params as $param_name)
	{
	if ( !(isset($config[$param_name]) ) ) continue;
	$class_info =& $config[$param_name];
	$pseudo_class = $this->getPrefixByParamName($param_name,$prefix);
	$this->Application->registerClass( $class_info['class'],
	$config['BasePath'].'/'.$class_info['file'],
	$pseudo_class);
	$event_manager->registerBuildEvent($pseudo_class,$class_info['build_event']);

	// register classes on which current class depends
	$require_classes = getArrayValue($class_info, 'require_classes');
	if($require_classes)
	{
	foreach($require_classes as $require_class)
	{
	$this->Application->Factory->registerDependency($class_info['class'], $require_class);
	}
	}
	}

	$register_classes = getArrayValue($config,'RegisterClasses');
	if($register_classes)
	{
	foreach($register_classes as $class_info)
	{
	$this->Application->registerClass( $class_info['class'],
	$config['BasePath'].'/'.$class_info['file'],
	$class_info['pseudo']);
	}
	}

	$regular_events = getArrayValue($config, 'RegularEvents');
	if($regular_events)
	{
	foreach($regular_events as $short_name => $regular_event_info)
	{
	$event_manager->registerRegularEvent( $short_name, $config['Prefix'].':'.$regular_event_info['EventName'], $regular_event_info['RunInterval'], $regular_event_info['Type'] );
	}
	}

	if ( is_array(getArrayValue($config, 'Hooks')) ) {
	foreach ($config['Hooks'] as $hook) {
	$do_prefix = $hook['DoPrefix'] == '' ? $config['Prefix'] : $hook['DoPrefix'];

	if ( !is_array($hook['HookToEvent']) ) {
	$hook_events = Array( $hook['HookToEvent'] );
	}
	else {
	$hook_events = $hook['HookToEvent'];
	}
	foreach ($hook_events as $hook_event) {
	$this->Application->registerHook($hook['HookToPrefix'], $hook['HookToSpecial'], $hook_event, $hook['Mode'], $do_prefix, $hook['DoSpecial'], $hook['DoEvent'], $hook['Conditional']);
	}
	}
	}

	if ( is_array(getArrayValue($config, 'AggregateTags')) ) {
	foreach ($config['AggregateTags'] as $aggregate_tag) {
	$aggregate_tag['LocalPrefix'] = $config['Prefix'];
	$this->Application->registerAggregateTag($aggregate_tag);
	}
	}

	if ( $this->Application->isDebugMode() && dbg_ConstOn('DBG_VALIDATE_CONFIGS') && isset($config['TableName']) )
	{
	global $debugger;
	$tablename = $config['TableName'];

	$conn =& $this->Application->GetADODBConnection();
	$res = $conn->Query("DESCRIBE $tablename");

	foreach ($res as $field) {
	$f_name = $field['Field'];
	if (getArrayValue($config, 'Fields')) {
	if ( !array_key_exists ($f_name, $config['Fields']) ) {
	$debugger->appendHTML("<b class='debug_error'>Config Warning: </b>Field $f_name exists in the database, but is not defined in config file for prefix <b>".$config['Prefix']."</b>!");
	safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	}
	else {
	$options = $config['Fields'][$f_name];
	if ($field['Null'] == '') {
	if ( $f_name != $config['IDField'] && !isset($options['not_null']) && !isset($options['required']) ) {
	$debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field $f_name in config for prefix <b>".$config['Prefix']."</b> is NOT NULL in the database, but is not configured as not_null or required!");
	safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	}
	if ( isset($options['not_null']) && !isset($options['default']) ) {
	$debugger->appendHTML("<b class='debug_error'>Config Error: </b>Field $f_name in config for prefix <b>".$config['Prefix']."</b> is described as NOT NULL, but does not have DEFAULT value!");
	safeDefine('DBG_RAISE_ON_WARNINGS', 1);
	}
	}

	}
	}
	}
	}
	}

	/**
	* Reads unit (specified by $prefix)
	* option specified by $option
	*
	* @param string $prefix
	* @param string $option
	* @return string
	* @access public
	*/
	function getUnitOption($prefix,$name)
	{
	return isset($this->configData[$prefix][$name]) ? $this->configData[$prefix][$name] : false;
	}

	/**
	* Read all unit with $prefix options
	*
	* @param string $prefix
	* @return Array
	* @access public
	*/
	function getUnitOptions($prefix)
	{
	return $this->prefixRegistred($prefix) ? $this->configData[$prefix] : false;
	}

	/**
	* Set's new unit option value
	*
	* @param string $prefix
	* @param string $name
	* @param string $value
	* @access public
	*/
	function setUnitOption($prefix,$name,$value)
	{
	$this->configData[$prefix][$name] = $value;
	}

	function getPrefixByParamName($paramName,$prefix)
	{
	$pseudo_class_map=Array(
	'ItemClass'=>'%s',
	'ListClass'=>'%s_List',
	'EventHandlerClass'=>'%s_EventHandler',
	'TagProcessorClass'=>'%s_TagProcessor'
	);
	return sprintf($pseudo_class_map[$paramName],$prefix);
	}

	/**
	* Get's config file name based
	* on folder name supplied
	*
	* @param string $folderPath
	* @return string
	* @access private
	*/
	function getConfigName($folderPath)
	{
	return $folderPath.'/'.basename($folderPath).'_config.php';
	}

	/**
	* is_dir ajustment to work with
	* directory listings too
	*
	* @param string $folderPath
	* @return bool
	* @access private
	*/
	function isDir($folderPath)
	{
	- $base_name=basename($folderPath);
	- $ret=!($base_name=='.'\|\|$base_name=='..');
	- return $ret&&is_dir($folderPath);
	+ $base_name = basename($folderPath);
	+ $ret = !( $base_name == '.' \|\| $base_name == '..' );
	+ return $ret && is_dir($folderPath);
	}


	}


	?>
	\ No newline at end of file

	Property changes on: trunk/core/kernel/utility/unit_config_reader.php
	___________________________________________________________________
	Modified: cvs2svn:cvs-rev
	## -1 +1 ##
	-1.22
	\ No newline at end of property
	+1.23
	\ 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