removed naj.sk pagecounter

[mirrors/Kyberia-bloodline.git] / wwwroot / nodes.php

diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php
index 3757485ad36f744e148939a62d4afcbfc4fd65d3..a1e6456c3c5f89eaf78542503faaf1a26ce0ae34 100644 (file)
--- 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'];
@@ -67,14 +67,15 @@ $smarty->template_dir = TEMPLATE_DIR;
 //echo TEMPLATE_DIR.TEMPLATE_SET;
 //echo $smarty->template_dir;
 $smarty->compile_dir = SYSTEM_DATA."templates_c/";
-$smarty->config_dir = SMARTY_DIR.'configs/'; #XXX neexistuje
+$smarty->config_dir = SMARTY_DIR.'configs/'; //XXX neexistuje
 $smarty->cache_dir = SMARTY_DIR.'cache/';
 $smarty->plugins_dir = SMARTY_PLUGIN_DIR ;
 if ($_SESSION['debugging']) $smarty->debugging=true;
 
-//initializing variables
+// initializing variables
+// preg_replace prevents LFI
 if (empty($_POST['event'])) $event=false;
-else $event=$_POST['event'];
+else $event= preg_replace( "![^a-zA-Z0-9_]+!", "", $_POST['event']);
 
 
 if ($_SESSION['debugging']) {
@@ -160,7 +161,7 @@ if ($template_id=='rss')
        {
           require_once(INCLUDE_DIR.'/feedcreator.class.php');
 
-          $rss =& new UniversalFeedCreator();
+          $rss = new UniversalFeedCreator();
           $rss->title = "Kyberia mail";
           $rss->description = "";
           $rss->link = "https://". SYSTEM_URL . "/id/24";
@@ -181,7 +182,7 @@ if ($template_id=='rss')
                   $m = $set->getRecord();
                   if ($m['mail_to'] != $_SESSION['user_id'])
                           continue;
-                  $item =& new FeedItem();
+                  $item = new FeedItem();
                   $item->title = $m['mail_from_name'];
                   $item->link = "https://".SYSTEM_URL."/id/24";
                   $item->description = $m['mail_text'];
@@ -193,7 +194,7 @@ if ($template_id=='rss')
        {
                require_once(INCLUDE_DIR.'/feedcreator.class.php');
 
-               $rss =& new UniversalFeedCreator();
+               $rss = new UniversalFeedCreator();
                $rss->title = "Kyberia bookmarks";
                $rss->link = "http://".SYSTEM_URL."/id/19";
 
@@ -205,7 +206,7 @@ if ($template_id=='rss')
                        if (is_array($_item['children']))
                                foreach ($_item['children'] as $_b)
                                {
-                                       $item =& new FeedItem();
+                                       $item = new FeedItem();
                                        $item->title = $_b['node_name'];
                                        $item->link = "http://".SYSTEM_URL."/id/".$_b['node_id']."/rss";
                                        $rss->addItem($item);
@@ -217,7 +218,7 @@ if ($template_id=='rss')
        {
                require_once(INCLUDE_DIR.'/feedcreator.class.php');
 
-               $rss =& new UniversalFeedCreator();
+               $rss = new UniversalFeedCreator();
                $rss->title = $node['node_name'];
                $rss->description = "";
                $rss->link = "http://".SYSTEM_URL."/id/".$node['node_id'];
@@ -239,7 +240,7 @@ if ($template_id=='rss')
 
                foreach ($_items as $_item)
                {
-                       $item =& new FeedItem();
+                       $item = new FeedItem();
                        $item->title = $_item['node_name'];
                        $item->link = "http://".SYSTEM_URL."/id/".$_item['node_id'];
                        $item->description = $_item['node_content'];
@@ -283,7 +284,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 +331,7 @@ elseif (!$permissions['r'] && $_GET['magic_word']) {
 
 
 else {
-       $log->log('enter',$node['node_id'],'failed');
+       logger::log('enter',$node['node_id'],'failed');
 }
 
 
@@ -343,17 +344,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);