X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=wwwroot%2Fnodes.php;h=586f81ecbb1d9bf4972d720eacf319038c64f732;hb=2fb33507204ed8c25b7fb90238c9cc5b7af60fa2;hp=3757485ad36f744e148939a62d4afcbfc4fd65d3;hpb=39244cfcf0fdf2805a10499567555087b167c9bf;p=mirrors%2FKyberia-bloodline.git

diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php
index 3757485..586f81e 100644
--- a/wwwroot/nodes.php
+++ b/wwwroot/nodes.php
@@ -42,7 +42,7 @@ require(INCLUDE_DIR.'error_messages.inc');
 require(INCLUDE_DIR.'database.inc');
 
 $db = new CLASS_DATABASE();
-$log = new log; //XXX
+$logger = new logger; //XXX
 
 if (!empty($_GET['template_id'])) {
 	$template_id=$_GET['template_id'];
@@ -283,7 +283,7 @@ if ($_SESSION['user_id']) {
 //if node is css
 if ($node['template_id']!='2019721'){
 
-	$log->log('enter',$node['node_id'],'ok',$node['node_user_subchild_count']);
+	$logger->log('enter',$node['node_id'],'ok',$node['node_user_subchild_count']);
 	if (!empty($_SESSION['user_id']) && is_numeric($node['node_id'])) {
 		$q="update node_access set visits=visits+1,node_user_subchild_count='0',last_visit=NOW() where node_id='".$node['node_id']."' and user_id='".$_SESSION['user_id']."'";
 //		echo $q;
@@ -330,7 +330,7 @@ elseif (!$permissions['r'] && $_GET['magic_word']) {
 
 
 else {
-	$log->log('enter',$node['node_id'],'failed');
+	$logger->log('enter',$node['node_id'],'failed');
 }
 
 
@@ -343,17 +343,32 @@ if ($user_id=$_SESSION['user_id']) {
 	$smarty->assign('bookstyl',$_SESSION['bookstyl']);
 	$smarty->assign('fook',$_SESSION['fook']);
 	$smarty->assign('user_id',$_SESSION['user_id']);
-	if (!empty($_SESSION['cube_vector'])) $smarty->assign('cube_vector',$_SESSION['cube_vector']);
+	if (!empty($_SESSION['cube_vector'])) 
+		$smarty->assign('cube_vector',$_SESSION['cube_vector']);
         $smarty->assign('friends',$_SESSION['friends']); //req by freezy, done by darkaural
 	$smarty->assign('user_quota',$_SESSION['user_quota']);
-	$newmailset=$db->query("select user_mail,user_mail_name,user_k,k_wallet from users where user_id='$user_id'");
+
+	$newmail_q = sprintf('select u.user_mail_id
+				, u.user_k
+				, u.k_wallet
+				, u.user_mail
+				, ms.user_id as mail_sender_id
+				, ms.login as mail_sender
+				from users u
+				left join users ms on ms.user_id = u.user_mail_id
+				where u.user_id = %d',
+				$user_id);
+	$newmailset = $db->query($newmail_q);
+
+#	$newmailset=$db->query("select user_mail,user_mail_name,user_k,k_wallet from users where user_id='$user_id'");
+
 	$newmailset->next();
 	$new_mail=$newmailset->getString('user_mail');
 	$newmailset2 = $db->query("select users.user_mail_id,mailsender.login
  from users left join users as mailsender on users.user_mail_id = mailsender.user_id where users.user_id = '$user_id'");
 	$newmailset2->next();
 	$smarty->assign('new_mail',$new_mail);
-	$smarty->assign('new_mail_name',$newmailset->getString('user_mail_name'));
+	$smarty->assign('new_mail_name',$newmailset->getString('mail_sender'));
 	$smarty->assign('new_mail_name2',$newmailset2->getString('login'));
 	$user_k=$newmailset->getString('user_k');
 	$smarty->assign('user_k',$user_k);